OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a77e929
)
mdio-octeon: use an unique MDIO bus name.
author
Florian Fainelli
<florian@openwrt.org>
Mon, 9 Jan 2012 23:59:27 +0000
(23:59 +0000)
committer
David S. Miller
<davem@davemloft.net>
Wed, 11 Jan 2012 00:35:02 +0000
(16:35 -0800)
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/mdio-octeon.c
patch
|
blob
|
history
diff --git
a/drivers/net/phy/mdio-octeon.c
b/drivers/net/phy/mdio-octeon.c
index
bd12ba9
..
826d961
100644
(file)
--- 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;