From 490e4acd835414af5747a9dfd849ea83aaaaccb8 Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Thu, 10 Apr 2008 23:30:07 +0900
Subject: [PATCH] --- yaml --- r: 88295 b: refs/heads/master c:
 84b7901f8d5a17536ef2df7fd628ab865df8fe3a h: refs/heads/master i:   88293:
 244e4724707cdc8b79fb3227d978b6cc1f92f0eb   88291:
 b64b42ce39d1e73be27193f0be26580c81c044c6   88287:
 836461a74651c1d0fabc9918c1bf06ac1f8a7cf1 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/macb.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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