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);