lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lantiq_etop: use an unique MDIO bus name.

Browse Source 
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli
2012-01-09 23:59:14 +00:00
committed by David S. Miller
parent 391420f7b8
commit d1b86507d8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/lantiq_etop.c
View File

@@ -98,6 +98,7 @@ struct ltq_etop_chan {
struct ltq_etop_priv { struct ltq_etop_priv {
struct net_device *netdev; struct net_device *netdev;
struct platform_device *pdev;
struct ltq_eth_data *pldata; struct ltq_eth_data *pldata;
struct resource *res; struct resource *res;
@@ -436,7 +437,8 @@ ltq_etop_mdio_init(struct net_device *dev)
priv->mii_bus->read = ltq_etop_mdio_rd; priv->mii_bus->read = ltq_etop_mdio_rd;
priv->mii_bus->write = ltq_etop_mdio_wr; priv->mii_bus->write = ltq_etop_mdio_wr;
priv->mii_bus->name = "ltq_mii"; priv->mii_bus->name = "ltq_mii";
snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%x", 0); snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
priv->pdev->name, priv->pdev->id);
priv->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL); priv->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
if (!priv->mii_bus->irq) { if (!priv->mii_bus->irq) {
err = -ENOMEM; err = -ENOMEM;
@@ -734,6 +736,7 @@ ltq_etop_probe(struct platform_device *pdev)
dev->ethtool_ops = &ltq_etop_ethtool_ops; dev->ethtool_ops = &ltq_etop_ethtool_ops;
priv = netdev_priv(dev); priv = netdev_priv(dev);
priv->res = res; priv->res = res;
priv->pdev = pdev;
priv->pldata = dev_get_platdata(&pdev->dev); priv->pldata = dev_get_platdata(&pdev->dev);
priv->netdev = dev; priv->netdev = dev;
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);