diff mbox

ssb: Fix error routine when fallback SPROM fails

Message ID 20161105190857.19386-1-Larry.Finger@lwfinger.net (mailing list archive)
State Accepted
Commit 8052d7245b6089992343c80b38b14dbbd8354651
Delegated to: Kalle Valo
Headers show

Commit Message

Larry Finger Nov. 5, 2016, 7:08 p.m. UTC
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>
---
 drivers/ssb/pci.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Kalle Valo Nov. 17, 2016, 6:49 a.m. UTC | #1
Larry Finger <Larry.Finger@lwfinger.net> wrote:
> 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>

Patch applied to wireless-drivers-next.git, thanks.

8052d7245b60 ssb: Fix error routine when fallback SPROM fails
diff mbox

Patch

diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 0f28c08..77b551d 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);