1 files changed, 12 insertions, 2 deletions

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index ec31f7dd5549..b8379b90d045 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -13,6 +13,12 @@
 MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
 MODULE_LICENSE("GPL");
 
+/* contains the number the next bus should get. */
+static unsigned int bcma_bus_next_num = 0;
+
+/* bcma_buses_mutex locks the bcma_bus_next_num */
+static DEFINE_MUTEX(bcma_buses_mutex);
+
 static int bcma_bus_match(struct device *dev, struct device_driver *drv);
 static int bcma_device_probe(struct device *dev);
 static int bcma_device_remove(struct device *dev);
@@ -93,7 +99,7 @@ static int bcma_register_cores(struct bcma_bus *bus)
 
                 core->dev.release = bcma_release_core_dev;
                 core->dev.bus = &bcma_bus_type;
-                dev_set_name(&core->dev, "bcma%d:%d", 0/*bus->num*/, dev_id);
+                dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);
 
                 switch (bus->hosttype) {
                 case BCMA_HOSTTYPE_PCI:
@@ -132,11 +138,15 @@ static void bcma_unregister_cores(struct bcma_bus *bus)
         }
 }
 
-int bcma_bus_register(struct bcma_bus *bus)
+int __devinit bcma_bus_register(struct bcma_bus *bus)
 {
         int err;
         struct bcma_device *core;
 
+        mutex_lock(&bcma_buses_mutex);
+        bus->num = bcma_bus_next_num++;
+        mutex_unlock(&bcma_buses_mutex);
+
         /* Scan for devices (cores) */
         err = bcma_bus_scan(bus);
         if (err) {