]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ssb: Fix error routine when fallback SPROM fails
authorLarry Finger <Larry.Finger@lwfinger.net>
Sat, 5 Nov 2016 19:08:57 +0000 (14:08 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 17 Nov 2016 06:49:04 +0000 (08:49 +0200)
When there is a CRC error in the SPROM read from the device, the code
attempts to handle a fallback SPROM. When this also fails, the driver
returns zero rather than an error code.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/ssb/pci.c

index 0f28c08fcb3c76f4a2deaf3cd084a39f800db142..77b551da57288c11d21d6ff40b65b1d8b01ed887 100644 (file)
@@ -909,6 +909,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
                        if (err) {
                                ssb_warn("WARNING: Using fallback SPROM failed (err %d)\n",
                                         err);
+                               goto out_free;
                        } else {
                                ssb_dbg("Using SPROM revision %d provided by platform\n",
                                        sprom->revision);