1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index a0272bbfc4f6..3bc3ec26fd0e 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -21,6 +21,7 @@ struct bcma_device_id_name {
 };
 
 static const struct bcma_device_id_name bcma_arm_device_names[] = {
+        { BCMA_CORE_4706_MAC_GBIT_COMMON, "BCM4706 GBit MAC Common" },
         { BCMA_CORE_ARM_1176, "ARM 1176" },
         { BCMA_CORE_ARM_7TDMI, "ARM 7TDMI" },
         { BCMA_CORE_ARM_CM3, "ARM CM3" },
@@ -33,7 +34,6 @@ static const struct bcma_device_id_name bcma_bcm_device_names[] = {
         { BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
         { BCMA_CORE_AMEMC, "AMEMC (DDR)" },
         { BCMA_CORE_ALTA, "ALTA (I2S)" },
-        { BCMA_CORE_4706_MAC_GBIT_COMMON, "BCM4706 GBit MAC Common" },
         { BCMA_CORE_INVALID, "Invalid" },
         { BCMA_CORE_CHIPCOMMON, "ChipCommon" },
         { BCMA_CORE_ILINE20, "ILine 20" },
@@ -295,11 +295,15 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
 
         /* check if component is a core at all */
         if (wrappers[0] + wrappers[1] == 0) {
-                /* we could save addrl of the router
-                if (cid == BCMA_CORE_OOB_ROUTER)
-                 */
-                bcma_erom_skip_component(bus, eromptr);
-                return -ENXIO;
+                /* Some specific cores don't need wrappers */
+                switch (core->id.id) {
+                case BCMA_CORE_4706_MAC_GBIT_COMMON:
+                /* Not used yet: case BCMA_CORE_OOB_ROUTER: */
+                        break;
+                default:
+                        bcma_erom_skip_component(bus, eromptr);
+                        return -ENXIO;
+                }
         }
 
         if (bcma_erom_is_bridge(bus, eromptr)) {