Commit cdd861d6 authored Oct 13, 2010 by Dan Carpenter Committed by David S. Miller Oct 18, 2010

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: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ccc901ee

drivers/net/ns83820.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message