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

Commit 186e8687 authored by Denis Efremov's avatar Denis Efremov Committed by David S. Miller
Browse files

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: default avatarDenis Efremov <yefremov.denis@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c073cfc8

drivers/net/ethernet/nvidia/forcedeth.c

+2 −2
Original line number Diff line number Diff line
@@ -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)) {