diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-10-13 09:18:53 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-18 01:53:35 -0700 |
| commit | cdd861d68d27a0d0ebe4e641d20d8cfa5cef405f (patch) | |
| tree | e45ce5c639d73e3e21bee1f2fe65f83a07e932e1 /drivers/net/ns83820.c | |
| parent | ccc901ee58cfb090a31216a6eda0f1e9dfc572fa (diff) | |
| download | lwn-cdd861d68d27a0d0ebe4e641d20d8cfa5cef405f.tar.gz lwn-cdd861d68d27a0d0ebe4e641d20d8cfa5cef405f.zip | |
ns83820: spin_lock_irq() => spin_lock()
This is essentially cosmetic. At this point the IRQs are already
disabled because we called spin_lock_irq(&dev->rx_info.lock).
The real bug here was fixed back in 2006 in 3a10ccebe: "[PATCH] lock
validator: fix ns83820.c irq-flags bug". Prior to that patch, it was
a "spin_lock_irq is not nestable" type bug. The 2006 patch changes the
unlock to not re-enable IRQs, which eliminates the potential deadlock.
But this bit was missed. We should change the lock function as well so
it balances nicely.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ns83820.c')
| -rw-r--r-- | drivers/net/ns83820.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index 3bbd0aab17e8..84134c766f3a 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c @@ -772,7 +772,7 @@ static int ns83820_setup_rx(struct net_device *ndev) phy_intr(ndev); /* Okay, let it rip */ - spin_lock_irq(&dev->misc_lock); + spin_lock(&dev->misc_lock); dev->IMR_cache |= ISR_PHY; dev->IMR_cache |= ISR_RXRCMP; //dev->IMR_cache |= ISR_RXERR; |