firmware_class: Fix condition in directory search loop (Closes: #804862)
(cherry picked from commit 5269f93afe
)
This commit is contained in:
parent
6d16ac8835
commit
7d0a4425fd
|
@ -21,6 +21,7 @@ linux (4.2.6-2) UNRELEASED; urgency=medium
|
||||||
* [x86] Enable PINCTRL_BAYTRAIL (Closes: #797949)
|
* [x86] Enable PINCTRL_BAYTRAIL (Closes: #797949)
|
||||||
* qxl: Enable by default (Closes: #779515)
|
* qxl: Enable by default (Closes: #779515)
|
||||||
* [s390*] Update linux-compiler metapackage to gcc-4.9
|
* [s390*] Update linux-compiler metapackage to gcc-4.9
|
||||||
|
* firmware_class: Fix condition in directory search loop (Closes: #804862)
|
||||||
|
|
||||||
-- Salvatore Bonaccorso <carnil@debian.org> Tue, 10 Nov 2015 22:05:58 +0100
|
-- Salvatore Bonaccorso <carnil@debian.org> Tue, 10 Nov 2015 22:05:58 +0100
|
||||||
|
|
||||||
|
|
|
@ -23,13 +23,11 @@ format to detect missing firmware.
|
||||||
---
|
---
|
||||||
--- a/drivers/base/firmware_class.c
|
--- a/drivers/base/firmware_class.c
|
||||||
+++ b/drivers/base/firmware_class.c
|
+++ b/drivers/base/firmware_class.c
|
||||||
@@ -340,17 +340,20 @@ static int fw_get_filesystem_firmware(st
|
@@ -340,16 +340,19 @@ static int fw_get_filesystem_firmware(st
|
||||||
}
|
|
||||||
rc = fw_read_file_contents(file, buf);
|
rc = fw_read_file_contents(file, buf);
|
||||||
fput(file);
|
fput(file);
|
||||||
- if (rc)
|
if (rc)
|
||||||
- dev_warn(device, "firmware, attempted to load %s, but failed with error %d\n",
|
- dev_warn(device, "firmware, attempted to load %s, but failed with error %d\n",
|
||||||
+ if (!rc)
|
|
||||||
+ dev_dbg(device, "firmware, attempted to load %s, but failed with error %d\n",
|
+ dev_dbg(device, "firmware, attempted to load %s, but failed with error %d\n",
|
||||||
path, rc);
|
path, rc);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue