Merge branch 'linux-2.6'

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index e323efd4ed18..0cc4369cacba 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -755,7 +755,7 @@ out_unlock:
  */
 void phy_start(struct phy_device *phydev)
 {
-        spin_lock(&phydev->lock);
+        spin_lock_bh(&phydev->lock);
 
         switch (phydev->state) {
                 case PHY_STARTING:
@@ -769,7 +769,7 @@ void phy_start(struct phy_device *phydev)
                 default:
                         break;
         }
-        spin_unlock(&phydev->lock);
+        spin_unlock_bh(&phydev->lock);
 }
 EXPORT_SYMBOL(phy_stop);
 EXPORT_SYMBOL(phy_start);