diff options
authorLuis R. Rodriguez <>2016-02-28 21:57:55 +0100
committerJames Morris <>2016-02-29 19:08:06 +1100
commit8e516aa52cea98b23e14c5d67fe74147e73d25f7 (patch)
parent2cb6d6460f1a171c71c134e0efe3a94c2206d080 (diff)
firmware: change kernel read fail to dev_dbg()
When we now use the new kernel_read_file_from_path() we are reporting a failure when we iterate over all the paths possible for firmware. Before using kernel_read_file_from_path() we only reported a failure once we confirmed a file existed with filp_open() but failed with fw_read_file_contents(). With kernel_read_file_from_path() both are done for us and we obviously are now reporting too much information given that some optional paths will always fail and clutter the logs. fw_get_filesystem_firmware() already has a check for failure and uses an internal flag, FW_OPT_NO_WARN, but this does not let us capture other unxpected errors. This enables that as changed by Neil via commit: "firmware: Be a bit more verbose about direct firmware loading failure" Reported-by: Heiner Kallweit <> Cc: Neil Horman <> Cc: Heiner Kallweit <> Cc: Mimi Zohar <> Cc: Kees Cook <> Signed-off-by: Luis R. Rodriguez <> Acked-by: Kees Cook <> Acked-by: Ming Lei <> Signed-off-by: James Morris <>
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index a414008ea64c..f3f7215ad378 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -329,8 +329,12 @@ static int fw_get_filesystem_firmware(struct device *device,
rc = kernel_read_file_from_path(path, &buf->data, &size,
if (rc) {
- dev_warn(device, "loading %s failed with error %d\n",
- path, rc);
+ if (rc == -ENOENT)
+ dev_dbg(device, "loading %s failed with error %d\n",
+ path, rc);
+ else
+ dev_warn(device, "loading %s failed with error %d\n",
+ path, rc);
dev_dbg(device, "direct-loading %s\n", buf->fw_id);