Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 817380e1 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

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: default avatarVladimir Kolpakov <vova.kolpakov@gmail.com>
Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6bff995

drivers/net/ethernet/rdc/r6040.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1188,7 +1188,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, 
	lp->mii_bus->write = r6040_mdiobus_write;

	lp->mii_bus->write = r6040_mdiobus_write;

	lp->mii_bus->reset = r6040_mdiobus_reset;

	lp->mii_bus->reset = r6040_mdiobus_reset;

	lp->mii_bus->name = "r6040_eth_mii";

	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);

	lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);

	if (!lp->mii_bus->irq) {

	if (!lp->mii_bus->irq) {

		dev_err(&pdev->dev, "mii_bus irq allocation failed\n");

		dev_err(&pdev->dev, "mii_bus irq allocation failed\n");