diff --git a/[refs] b/[refs] index e6148eab422c..8e97b9cd1c9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d137fdd16b26be31a653f83d6ce4d3a1ed8701e +refs/heads/master: 84b7901f8d5a17536ef2df7fd628ab865df8fe3a diff --git a/trunk/drivers/net/macb.c b/trunk/drivers/net/macb.c index 1d210ed46130..10fcea59755e 100644 --- a/trunk/drivers/net/macb.c +++ b/trunk/drivers/net/macb.c @@ -1257,6 +1257,8 @@ static int __exit macb_remove(struct platform_device *pdev) if (dev) { bp = netdev_priv(dev); + if (bp->phy_dev) + phy_disconnect(bp->phy_dev); mdiobus_unregister(&bp->mii_bus); kfree(bp->mii_bus.irq); unregister_netdev(dev);