mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 01:31:44 +00:00
r6040: use an unique MDIO bus name
We should use an unique MDIO bus name which does not clash with anything else in the system like the Fixed MDIO bus. The bus is now named: r6040-<card number> which is unique in the system. Reported-by: Vladimir Kolpakov <vova.kolpakov@gmail.com> Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e6bff995f8
commit
817380e1d0
@ -1188,7 +1188,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
|
||||
lp->mii_bus->write = r6040_mdiobus_write;
|
||||
lp->mii_bus->reset = r6040_mdiobus_reset;
|
||||
lp->mii_bus->name = "r6040_eth_mii";
|
||||
snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "%x", card_idx);
|
||||
snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
|
||||
dev_name(&pdev->dev), card_idx);
|
||||
lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
|
||||
if (!lp->mii_bus->irq) {
|
||||
dev_err(&pdev->dev, "mii_bus irq allocation failed\n");
|
||||
|
Loading…
Reference in New Issue
Block a user