diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2016-11-05 15:08:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-09 02:32:16 -0500 |
commit | b8425f41346610bd2137eee2c374227ee532e497 (patch) | |
tree | c0696ddfe4abd2c25bf49c877e33e36f770b5aed /drivers/ssb | |
parent | 6437abdb624edc4e68859e66768933d2b5eb9f09 (diff) |
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 <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ssb')
-rw-r--r-- | drivers/ssb/pci.c | 1 |
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, | |||
909 | if (err) { | 909 | if (err) { |
910 | ssb_warn("WARNING: Using fallback SPROM failed (err %d)\n", | 910 | ssb_warn("WARNING: Using fallback SPROM failed (err %d)\n", |
911 | err); | 911 | err); |
912 | goto out_free; | ||
912 | } else { | 913 | } else { |
913 | ssb_dbg("Using SPROM revision %d provided by platform\n", | 914 | ssb_dbg("Using SPROM revision %d provided by platform\n", |
914 | sprom->revision); | 915 | sprom->revision); |