aboutsummaryrefslogtreecommitdiff
path: root/drivers/bcma/main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-02-08 19:12:12 -0500
committerDavid S. Miller <davem@davemloft.net>2012-02-08 19:12:12 -0500
commit64db880e7488a6d31363ad17c4c0590f27fd48e5 (patch)
treeb3705dea9d64b78f93db5f7bead545e5ee38b2aa /drivers/bcma/main.c
parent5ca3b72c5da47d95b83857b768def6172fbc080a (diff)
parent7a73b08b50b075b114d0f608099e4634f9c73ae7 (diff)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/bcma/main.c')
-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 febbc0a1222..ec31f7dd554 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);