1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index c8bc60a7040c..42230fc81e33 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -198,7 +198,9 @@ static irqreturn_t at91ether_phy_interrupt(int irq, void *dev_id)
         struct net_device *dev = (struct net_device *) dev_id;
         struct at91_private *lp = netdev_priv(dev);
         unsigned int phy;
+        unsigned long flags;
 
+        spin_lock_irqsave(&lp->lock, flags);
         /*
          * This hander is triggered on both edges, but the PHY chips expect
          * level-triggering.  We therefore have to check if the PHY actually has
@@ -240,6 +242,7 @@ static irqreturn_t at91ether_phy_interrupt(int irq, void *dev_id)
 
 done:
         disable_mdi();
+        spin_unlock_irqrestore(&lp->lock, flags);
 
         return IRQ_HANDLED;
 }
@@ -396,9 +399,11 @@ static void at91ether_check_link(unsigned long dev_id)
         struct net_device *dev = (struct net_device *) dev_id;
         struct at91_private *lp = netdev_priv(dev);
 
+        spin_lock_irq(&lp->lock);
         enable_mdi();
         update_linkspeed(dev, 1);
         disable_mdi();
+        spin_unlock_irq(&lp->lock);
 
         mod_timer(&lp->check_timer, jiffies + LINK_POLL_INTERVAL);
 }