From 8a6ae77cfea9664458ac41e4d055616f9174f4e0 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 14 Aug 2009 05:15:15 +0000
Subject: [PATCH] --- yaml --- r: 159669 b: refs/heads/master c:
 0da6d7b331f391d3c0ce52fb5289f7edeb94e280 h: refs/heads/master i:   159667:
 00a9fd94cc8553dfa74b4dd57db478d503524b41 v: v3

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

diff --git a/[refs] b/[refs]
index 4572956af1cc..733ddefab202 100644
--- 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
index b75b48e83970..1d3ee03fa648 100644
--- 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);