From: Henrik Rydberg <rydberg@euromail.se>
Date: Tue, 31 Jan 2012 19:22:15 +0000 (-0500)
Subject: bcma: don't fail for bad SPROM CRC
X-Git-Tag: MMI-PSA29.97-13-9~17300^2^2~33
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2e6b411971de727a5bcea4323331fdaa70a81b11;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

bcma: don't fail for bad SPROM CRC

The brcmsmac driver is now using the bcma SPROM CRC check, which does
not recognize all chipsets that were functional prior to the switch. In
particular, the current code bails out on odd CRC errors in recent
Macbooks. This patch ignores those errors, with the argument that an
unrecognized SPROM should be treated similarly to a non-existing one.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index febbc0a1222a..ec31f7dd5549 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -169,10 +169,8 @@ int bcma_bus_register(struct bcma_bus *bus)
 	err = bcma_sprom_get(bus);
 	if (err == -ENOENT) {
 		pr_err("No SPROM available\n");
-	} else if (err) {
+	} else if (err)
 		pr_err("Failed to get SPROM: %d\n", err);
-		return -ENOENT;
-	}
 
 	/* Register found cores */
 	bcma_register_cores(bus);