---

yaml --- r: 122853 b: refs/heads/master c: dd04519 h: refs/heads/master i: 122851: 3623bc2 v: v3
git-mirror · Dec 26, 2008 · 1695eab · 1695eab
1 parent d797e58
commit 1695eab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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;