From 0ea4843e381a8dca0c24d328dd9d2b1db43b1950 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 14 Aug 2006 23:00:20 -0700 Subject: [PATCH] --- yaml --- r: 33509 b: refs/heads/master c: 76cb4fe7c0926c2c59f4a36ab169aa2d547c93d1 h: refs/heads/master i: 33507: 02b13d4b065b2adcb0cea843fb83a42725de85a3 v: v3 --- [refs] | 2 +- trunk/drivers/net/smc91x.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6131808b323d..c2a88cdd3e8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab1976682f31661a898b92593bccfeae14d0a0ae +refs/heads/master: 76cb4fe7c0926c2c59f4a36ab169aa2d547c93d1 diff --git a/trunk/drivers/net/smc91x.c b/trunk/drivers/net/smc91x.c index 3d8dcb6c8758..cf62373b808b 100644 --- a/trunk/drivers/net/smc91x.c +++ b/trunk/drivers/net/smc91x.c @@ -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);