[PATCH v4 03/19] firmware: clean up filesystem load exit path
flat view
STALE3906d
REVIEWED: 1 (1M)
From: Mimi Zohar <hidden>
Date: 2016-02-12 18:30:46
Also in:
kexec, linux-fsdevel
Subsystem:
driver core, kobjects, debugfs and sysfs, the rest · Maintainers:
Greg Kroah-Hartman, "Rafael J. Wysocki", Danilo Krummrich, Johan Hovold, Linus Torvalds
Revision v4 of 2 in this series; 1 review trailer.
Revisions (2)
- v3 [diff vs current]
- v4 current
From: Kees Cook <redacted> This makes the error and success paths more readable while trying to load firmware from the filesystem. Signed-off-by: Kees Cook <redacted> Cc: Josh Boyer <redacted> Cc: David Howells <dhowells@redhat.com> Acked-by: Luis R. Rodriguez <mcgrof@kernel.org> Signed-off-by: Mimi Zohar <redacted> --- drivers/base/firmware_class.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 7bc4ad0..c743a2f 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c@@ -361,19 +361,17 @@ static int fw_get_filesystem_firmware(struct device *device, continue; rc = fw_read_file_contents(file, buf); fput(file); - if (rc) + if (rc) { dev_warn(device, "loading %s failed with error %d\n", path, rc); - else - break; - } - __putname(path); - - if (!rc) { + continue; + } dev_dbg(device, "direct-loading %s\n", buf->fw_id); fw_finish_direct_load(device, buf); + break; } + __putname(path); return rc; }
--
2.1.0