From ea74ac77a7cbe2e1cc5e2ccb75a5cdff84b53e0e Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 5 Sep 2011 08:58:29 +0100 Subject: [PATCH] --- yaml --- r: 263710 b: refs/heads/master c: 1df726ef0a700587a712a3660b2caa8e533c7de9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/arm/am79c961a.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8843f0a54411..73cd4fc40079 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb492c9160f3d40d09456a79cc669fba74d7d9cc +refs/heads/master: 1df726ef0a700587a712a3660b2caa8e533c7de9 diff --git a/trunk/drivers/net/arm/am79c961a.c b/trunk/drivers/net/arm/am79c961a.c index 52fe21e1e2cd..3b1416e3d217 100644 --- a/trunk/drivers/net/arm/am79c961a.c +++ b/trunk/drivers/net/arm/am79c961a.c @@ -308,8 +308,11 @@ static void am79c961_timer(unsigned long data) struct net_device *dev = (struct net_device *)data; struct dev_priv *priv = netdev_priv(dev); unsigned int lnkstat, carrier; + unsigned long flags; + spin_lock_irqsave(&priv->chip_lock, flags); lnkstat = read_ireg(dev->base_addr, ISALED0) & ISALED0_LNKST; + spin_unlock_irqrestore(&priv->chip_lock, flags); carrier = netif_carrier_ok(dev); if (lnkstat && !carrier) {