X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fphy%2Fmdio_bus.c;h=1b236bdf6b928d0dafa81c64ddcd3ac679c32e6c;hb=2090af718014f3d434fb8b85b00eeea01ebcec19;hp=ad93b0da87f020b2e4c1de55f9de52db271bc089;hpb=23fd07750a789a66fe88cf173d52a18f1a387da4;p=linux-2.6

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index ad93b0da87..1b236bdf6b 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -29,7 +29,6 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
@@ -61,6 +60,11 @@ int mdiobus_register(struct mii_bus *bus)
 	for (i = 0; i < PHY_MAX_ADDR; i++) {
 		struct phy_device *phydev;
 
+		if (bus->phy_mask & (1 << i)) {
+			bus->phy_map[i] = NULL;
+			continue;
+		}
+
 		phydev = get_phy_device(bus, i);
 
 		if (IS_ERR(phydev))
@@ -79,7 +83,7 @@ int mdiobus_register(struct mii_bus *bus)
 
 			phydev->dev.parent = bus->dev;
 			phydev->dev.bus = &mdio_bus_type;
-			sprintf(phydev->dev.bus_id, "phy%d:%d", bus->id, i);
+			snprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus->id, i);
 
 			phydev->bus = bus;