---

yaml --- r: 159669 b: refs/heads/master c: 0da6d7b h: refs/heads/master i: 159667: 00a9fd9 v: v3
git-mirror · Aug 14, 2009 · 8a6ae77 · 8a6ae77
1 parent 7440c58
commit 8a6ae77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 264bb4fab1a0952b4eef4df5b9e90bc050a2d1e6
+refs/heads/master: 0da6d7b331f391d3c0ce52fb5289f7edeb94e280
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -1893,7 +1893,9 @@ static int sky2_down(struct net_device *dev)
 	synchronize_irq(hw->pdev->irq);
 	napi_synchronize(&hw->napi);
 
+	spin_lock_bh(&sky2->phy_lock);
 	sky2_phy_power_down(hw, port);
+	spin_unlock_bh(&sky2->phy_lock);
 
 	/* turn off LED's */
 	sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);