summaryrefslogtreecommitdiff
path: root/drivers/ssb
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2016-11-05 22:08:57 +0300
committerSasha Levin <alexander.levin@verizon.com>2017-01-15 17:49:49 +0300
commit76fa34bf3e9c30b3e838b87ab2530728774f0e0d (patch)
tree8ba97a973bcf020e9bb60c7fd340952a91975c91 /drivers/ssb
parent14cd1eeed8c056e0821994b4ab67cb38db492255 (diff)
downloadlinux-76fa34bf3e9c30b3e838b87ab2530728774f0e0d.tar.xz
ssb: Fix error routine when fallback SPROM fails
[ Upstream commit 8052d7245b6089992343c80b38b14dbbd8354651 ] 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> Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/ssb')
-rw-r--r--drivers/ssb/pci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 0f28c08fcb3c..77b551da5728 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -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);