[linux] 05/13: firmware_class: Fix condition in directory search loop (Closes: #804862)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 7d0a4425fdaf5b52de52b6a1180906fa342d0b4f
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Nov 12 14:59:37 2015 +0000

    firmware_class: Fix condition in directory search loop (Closes: #804862)
    
    (cherry picked from commit 5269f93afe9d408e08c842eef261071e447ba7de)
---
 debian/changelog                                                    | 1 +
 .../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 d2e77a5..ce772e6 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 at 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 4663faa..abb0b70 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git