Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76cb4fe7 authored by Russell King's avatar Russell King Committed by Jeff Garzik
Browse files

[PATCH] lockdep: fix smc91x 



When booting using root-nfs, I'm seeing (independently) two lockdep dumps
in the smc91x driver.  The patch below fixes both.  Both dumps look like
real locking issues.

Nico - please review and ack if you think the patch is correct.

Dump 1:

Sending DHCP requests .
=================================
[ INFO: inconsistent lock state ]

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent ab197668

drivers/net/smc91x.c

+4 −4
Original line number Diff line number Diff line
@@ -321,12 +321,12 @@ static void smc_reset(struct net_device *dev) 
	DBG(2, "%s: %s\n", dev->name, __FUNCTION__);



	/* Disable all interrupts, block TX tasklet */

	spin_lock(&lp->lock);

	spin_lock_irq(&lp->lock);

	SMC_SELECT_BANK(2);

	SMC_SET_INT_MASK(0);

	pending_skb = lp->pending_tx_skb;

	lp->pending_tx_skb = NULL;

	spin_unlock(&lp->lock);

	spin_unlock_irq(&lp->lock);



	/* free any pending tx skb */

	if (pending_skb) {
@@ -448,12 +448,12 @@ static void smc_shutdown(struct net_device *dev) 
	DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__);



	/* no more interrupts for me */

	spin_lock(&lp->lock);

	spin_lock_irq(&lp->lock);

	SMC_SELECT_BANK(2);

	SMC_SET_INT_MASK(0);

	pending_skb = lp->pending_tx_skb;

	lp->pending_tx_skb = NULL;

	spin_unlock(&lp->lock);

	spin_unlock_irq(&lp->lock);

	if (pending_skb)

		dev_kfree_skb(pending_skb);