summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-01-09 23:59:27 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-10 16:35:02 -0800
commitd6c25beba35a76c002bff9235484d75a6f8e7e6b (patch)
tree30cca470f12d3eed947f4d8ee816bed23307d10f
parenta77e929a24ccf5a8545266a0c247e5ae862f13ba (diff)
downloadop-kernel-dev-d6c25beba35a76c002bff9235484d75a6f8e7e6b.zip
op-kernel-dev-d6c25beba35a76c002bff9235484d75a6f8e7e6b.tar.gz
mdio-octeon: use an unique MDIO bus name.
Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/mdio-octeon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c
index bd12ba9..826d961 100644
--- a/drivers/net/phy/mdio-octeon.c
+++ b/drivers/net/phy/mdio-octeon.c
@@ -118,7 +118,8 @@ static int __devinit octeon_mdiobus_probe(struct platform_device *pdev)
bus->mii_bus->priv = bus;
bus->mii_bus->irq = bus->phy_irq;
bus->mii_bus->name = "mdio-octeon";
- snprintf(bus->mii_bus->id, MII_BUS_ID_SIZE, "%x", bus->unit);
+ snprintf(bus->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+ bus->mii_bus->name, bus->unit);
bus->mii_bus->parent = &pdev->dev;
bus->mii_bus->read = octeon_mdiobus_read;
OpenPOWER on IntegriCloud