aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bcma
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2012-01-31 14:22:15 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-06 14:37:52 -0500
commit2e6b411971de727a5bcea4323331fdaa70a81b11 (patch)
treeb3449cb7f50dea8daca3f0f9170886c9ae11fce8 /drivers/bcma
parent55a2bb4a6d5e8c7b324d003e130fd9aaf33be4e6 (diff)
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>
Diffstat (limited to 'drivers/bcma')
-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)
169 err = bcma_sprom_get(bus); 169 err = bcma_sprom_get(bus);
170 if (err == -ENOENT) { 170 if (err == -ENOENT) {
171 pr_err("No SPROM available\n"); 171 pr_err("No SPROM available\n");
172 } else if (err) { 172 } else if (err)
173 pr_err("Failed to get SPROM: %d\n", err); 173 pr_err("Failed to get SPROM: %d\n", err);
174 return -ENOENT;
175 }
176 174
177 /* Register found cores */ 175 /* Register found cores */
178 bcma_register_cores(bus); 176 bcma_register_cores(bus);