diff options
| author | Denis Efremov <yefremov.denis@gmail.com> | 2012-07-20 23:54:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-21 01:18:36 +0200 |
| commit | 186e868786f97c8026f0a81400b451ace306b3a4 (patch) | |
| tree | cc09f713912a357e20a2df6d46f3c788ac88ca6a | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/... (diff) | |
| download | linux-186e868786f97c8026f0a81400b451ace306b3a4.tar.xz linux-186e868786f97c8026f0a81400b451ace306b3a4.zip | |
forcedeth: spin_unlock_irq in interrupt handler fix
The replacement of spin_lock_irq/spin_unlock_irq pair in interrupt
handler by spin_lock_irqsave/spin_lock_irqrestore pair.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Denis Efremov <yefremov.denis@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/nvidia/forcedeth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 8b7c5129c7e1..67edc2e15b82 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c @@ -3775,7 +3775,7 @@ static irqreturn_t nv_nic_irq_other(int foo, void *data) np->link_timeout = jiffies + LINK_TIMEOUT; } if (events & NVREG_IRQ_RECOVER_ERROR) { - spin_lock_irq(&np->lock); + spin_lock_irqsave(&np->lock, flags); /* disable interrupts on the nic */ writel(NVREG_IRQ_OTHER, base + NvRegIrqMask); pci_push(base); @@ -3785,7 +3785,7 @@ static irqreturn_t nv_nic_irq_other(int foo, void *data) np->recover_error = 1; mod_timer(&np->nic_poll, jiffies + POLL_WAIT); } - spin_unlock_irq(&np->lock); + spin_unlock_irqrestore(&np->lock, flags); break; } if (unlikely(i > max_interrupt_work)) { |