Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	net/bluetooth/l2cap_core.c

2 files changed, 6 insertions, 1 deletions

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 08a14a3d667e..873e2e4ac55f 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -149,7 +149,9 @@ int bcma_bus_register(struct bcma_bus *bus)
 
         /* Try to get SPROM */
         err = bcma_sprom_get(bus);
-        if (err) {
+        if (err == -ENOENT) {
+                pr_err("No SPROM available\n");
+        } else if (err) {
                 pr_err("Failed to get SPROM: %d\n", err);
                 return -ENOENT;
         }
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c
index ffbb0e32e921..8e8d5cf32e12 100644
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
@@ -143,6 +143,9 @@ int bcma_sprom_get(struct bcma_bus *bus)
         if (!bus->drv_cc.core)
                 return -EOPNOTSUPP;
 
+        if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM))
+                return -ENOENT;
+
         sprom = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
                         GFP_KERNEL);
         if (!sprom)