diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-02-08 14:53:43 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-08 14:53:43 -0500 |
commit | 7a73b08b50b075b114d0f608099e4634f9c73ae7 (patch) | |
tree | c422dce59ce7fa9a4ebf8f7512bb3879a3b83ed0 /drivers/bcma/main.c | |
parent | a1728800bed3b93b231d99e97c756f622b9991c2 (diff) | |
parent | e81a7bd55531a77d8c16d44766db4089c2983f1b (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/bcma/main.c')
-rw-r--r-- | drivers/bcma/main.c | 4 |
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); |