Commit cdd861d6 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller

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 3a10cceb: "[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: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ccc901ee
...@@ -772,7 +772,7 @@ static int ns83820_setup_rx(struct net_device *ndev) ...@@ -772,7 +772,7 @@ static int ns83820_setup_rx(struct net_device *ndev)
phy_intr(ndev); phy_intr(ndev);
/* Okay, let it rip */ /* Okay, let it rip */
spin_lock_irq(&dev->misc_lock); spin_lock(&dev->misc_lock);
dev->IMR_cache |= ISR_PHY; dev->IMR_cache |= ISR_PHY;
dev->IMR_cache |= ISR_RXRCMP; dev->IMR_cache |= ISR_RXRCMP;
//dev->IMR_cache |= ISR_RXERR; //dev->IMR_cache |= ISR_RXERR;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment