bcma: only map wrapper if its address is available

The Chipcommon B core does not have a wrap address and it would fail here.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/bcma/host_soc.c b/drivers/bcma/host_soc.c
index 3475e600011a5c5ce0ec6ffe2b41f4f68b04c0e7..1edd7e06462135f4ecc2192b67f12852e2a5a77d 100644 (file)
--- a/drivers/bcma/host_soc.c
+++ b/drivers/bcma/host_soc.c
@@ -134,12 +134,16 @@ static void bcma_host_soc_block_write(struct bcma_device *core,
 
 static u32 bcma_host_soc_aread32(struct bcma_device *core, u16 offset)
 {
+       if (WARN_ONCE(!core->io_wrap, "Accessed core has no wrapper/agent\n"))
+               return ~0;
        return readl(core->io_wrap + offset);
 }
 
 static void bcma_host_soc_awrite32(struct bcma_device *core, u16 offset,
                                  u32 value)
 {
+       if (WARN_ONCE(!core->io_wrap, "Accessed core has no wrapper/agent\n"))
+               return;
        writel(value, core->io_wrap + offset);
 }
 

diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index b4764c6bcf171ddb5273238fe9993d717ad18ec4..e9bd77249a4c91f329c163c647b20299d1f4a530 100644 (file)
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -421,10 +421,13 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
                core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);
                if (!core->io_addr)
                        return -ENOMEM;
-               core->io_wrap = ioremap_nocache(core->wrap, BCMA_CORE_SIZE);
-               if (!core->io_wrap) {
-                       iounmap(core->io_addr);
-                       return -ENOMEM;
+               if (core->wrap) {
+                       core->io_wrap = ioremap_nocache(core->wrap,
+                                                       BCMA_CORE_SIZE);
+                       if (!core->io_wrap) {
+                               iounmap(core->io_addr);
+                               return -ENOMEM;
+                       }
                }
        }
        return 0;