From 765358f2601d3d0c8fe504da9e5ab4fd6a257043 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 5 Nov 2016 14:08:57 -0500 Subject: [PATCH] ssb: Fix error routine when fallback SPROM fails commit 8052d7245b6089992343c80b38b14dbbd8354651 upstream. 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 Signed-off-by: Kalle Valo [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings --- drivers/ssb/pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c index 34c3bab90b9a..8d4ddd1cdbb8 100644 --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c @@ -713,6 +713,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus, ssb_printk(KERN_WARNING PFX "WARNING: Using" " fallback SPROM failed (err %d)\n", err); + goto out_free; } else { ssb_dprintk(KERN_DEBUG PFX "Using SPROM" " revision %d provided by" -- 2.39.2