projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
446bbc4
)
macb: use an unique MDIO bus name.
author
Florian Fainelli
<
[email protected]
>
Mon, 9 Jan 2012 23:59:11 +0000
(23:59 +0000)
committer
David S. Miller
<
[email protected]
>
Wed, 11 Jan 2012 00:35:00 +0000
(16:35 -0800)
Signed-off-by: Florian Fainelli <
[email protected]
>
Acked-by: Nicolas Ferre <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/cadence/macb.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/cadence/macb.c
b/drivers/net/ethernet/cadence/macb.c
index f3d5c65d99cf20ae57f14fc9b7dd2007d81bba85..23200680d4c16e08ab0b384b93340e81fb12f04f 100644
(file)
--- a/
drivers/net/ethernet/cadence/macb.c
+++ b/
drivers/net/ethernet/cadence/macb.c
@@
-243,7
+243,8
@@
static int macb_mii_init(struct macb *bp)
bp->mii_bus->read = &macb_mdio_read;
bp->mii_bus->write = &macb_mdio_write;
bp->mii_bus->reset = &macb_mdio_reset;
- snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%x", bp->pdev->id);
+ snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+ bp->pdev->name, bp->pdev->id);
bp->mii_bus->priv = bp;
bp->mii_bus->parent = &bp->dev->dev;
pdata = bp->pdev->dev.platform_data;