From 1695eabe7de75b1300ce4fea82b4121db006574e Mon Sep 17 00:00:00 2001
From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Thu, 25 Dec 2008 16:40:19 -0800
Subject: [PATCH] --- yaml --- r: 122853 b: refs/heads/master c:
 dd0451938815d8b901488b1058f52023892c6cde h: refs/heads/master i:   122851:
 3623bc2da0e7f5deb13045ad58f02468f9a42ae5 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/smsc911x.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8d7377ca36b1..5d23925ffc50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6332178d91ca1a9dbd99bd97cabbcf965d178e9f
+refs/heads/master: dd0451938815d8b901488b1058f52023892c6cde
diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c
index ecdde03d4167..8078f3545f16 100644
--- a/trunk/drivers/net/smsc911x.c
+++ b/trunk/drivers/net/smsc911x.c
@@ -1267,8 +1267,6 @@ static int smsc911x_stop(struct net_device *dev)
 	struct smsc911x_data *pdata = netdev_priv(dev);
 	unsigned int temp;
 
-	BUG_ON(!pdata->phy_dev);
-
 	/* Disable all device interrupts */
 	temp = smsc911x_reg_read(pdata, INT_CFG);
 	temp &= ~INT_CFG_IRQ_EN_;
@@ -1283,7 +1281,8 @@ static int smsc911x_stop(struct net_device *dev)
 	smsc911x_tx_update_txcounters(dev);
 
 	/* Bring the PHY down */
-	phy_stop(pdata->phy_dev);
+	if (pdata->phy_dev)
+		phy_stop(pdata->phy_dev);
 
 	SMSC_TRACE(IFDOWN, "Interface stopped");
 	return 0;