diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-11-12 14:59:37 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-12-04 01:15:54 +0000 |
| commit | 7d0a4425fdaf5b52de52b6a1180906fa342d0b4f (patch) | |
| tree | 3a929e9b6e35d3604888961fac866287d32af5b6 | |
| parent | 6d16ac88353be42ac1298e09d5bbe1ba2ba2eb91 (diff) | |
firmware_class: Fix condition in directory search loop (Closes: #804862)
(cherry picked from commit 5269f93afe9d408e08c842eef261071e447ba7de)
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index d2e77a5d8..ce772e65d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ linux (4.2.6-2) UNRELEASED; urgency=medium * [x86] Enable PINCTRL_BAYTRAIL (Closes: #797949) * qxl: Enable by default (Closes: #779515) * [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 diff --git a/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch b/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch index 4663faad5..abb0b704b 100644 --- a/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch +++ b/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch @@ -23,13 +23,11 @@ format to detect missing firmware. --- --- a/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); fput(file); -- if (rc) + if (rc) - 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", path, rc); else |