diff options
| author | Barry Song <Barry.Song@csr.com> | 2011-10-24 02:40:40 -0700 |
|---|---|---|
| committer | Barry Song <Barry.Song@csr.com> | 2011-10-24 02:45:43 -0700 |
| commit | 1e11bec9b09a28f81dd3173fec6b1c6c56b5e299 (patch) | |
| tree | cddb92f82bda3a5f362bb6d9f775d25dd1205e6b /drivers/net | |
| parent | 2558bd99cb1426a05ac8f1c78dc9c75a83ceb4bb (diff) | |
| parent | 91c2ebb90b1890abc648ba9dec5608cbc97e1cb9 (diff) | |
Merge branch 'l2x0' of rmk tree into prima2-l2x0
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/arm/am79c961a.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c index 52fe21e1e2c..3b1416e3d21 100644 --- a/drivers/net/arm/am79c961a.c +++ b/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) { |