Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	net/mac80211/debugfs_sta.c
	net/mac80211/sta_info.h

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index bcd1c01cde9e..b8379b90d045 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -179,10 +179,8 @@ int __devinit 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);