| Date | Wed, 16 Apr 2008 18:02:26 -0700 | From | Chris Wright <> | Subject | macb: Call phy_disconnect on removing |
| |
-stable review patch. If anyone has any objections, please let us know. ---------------------
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
upstream commit: 84b7901f8d5a17536ef2df7fd628ab865df8fe3a
Call phy_disconnect() on remove routine. Otherwise the phy timer causes a kernel crash when unloading.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Cc: Haavard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Chris Wright <chrisw@sous-sol.org> --- drivers/net/macb.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1257,6 +1257,8 @@ static int __devexit macb_remove(struct 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); --
|