Merge commit 'v3.3-rc4'

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);