summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rydberg2012-01-31 20:22:15 +0100
committerJohn W. Linville2012-02-06 20:37:52 +0100
commit2e6b411971de727a5bcea4323331fdaa70a81b11 (patch)
treeb3449cb7f50dea8daca3f0f9170886c9ae11fce8
parentath9k_hw: fix a RTS/CTS timeout regression (diff)
downloadkernel-qcow2-linux-2e6b411971de727a5bcea4323331fdaa70a81b11.tar.gz
kernel-qcow2-linux-2e6b411971de727a5bcea4323331fdaa70a81b11.tar.xz
kernel-qcow2-linux-2e6b411971de727a5bcea4323331fdaa70a81b11.zip
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>
-rw-r--r--drivers/bcma/main.c4
1 files changed, 1 insertions, 3 deletions
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);