Skip to content

Commit 6cff1f6

Browse files
Malcolm Priestleygregkh
authored andcommitted
staging: vt6655: Fix Warning on boot handle_irq_event_percpu.
WARNING: CPU: 0 PID: 929 at /home/apw/COD/linux/kernel/irq/handle.c:147 handle_irq_event_percpu+0x1d1/0x1e0() irq 17 handler device_intr+0x0/0xa80 [vt6655_stage] enabled interrupts Using spin_lock_irqsave appears to fix this. Signed-off-by: Malcolm Priestley <[email protected]> Cc: <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 92e3962 commit 6cff1f6

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/staging/vt6655/device_main.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2318,6 +2318,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {
23182318
int handled = 0;
23192319
unsigned char byData = 0;
23202320
int ii = 0;
2321+
unsigned long flags;
23212322

23222323
MACvReadISR(pDevice->PortOffset, &pDevice->dwIsr);
23232324

@@ -2331,7 +2332,8 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {
23312332

23322333
handled = 1;
23332334
MACvIntDisable(pDevice->PortOffset);
2334-
spin_lock_irq(&pDevice->lock);
2335+
2336+
spin_lock_irqsave(&pDevice->lock, flags);
23352337

23362338
//Make sure current page is 0
23372339
VNSvInPortB(pDevice->PortOffset + MAC_REG_PAGE1SEL, &byOrgPageSel);
@@ -2560,7 +2562,8 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {
25602562
if (byOrgPageSel == 1)
25612563
MACvSelectPage1(pDevice->PortOffset);
25622564

2563-
spin_unlock_irq(&pDevice->lock);
2565+
spin_unlock_irqrestore(&pDevice->lock, flags);
2566+
25642567
MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);
25652568

25662569
return IRQ_RETVAL(handled);

0 commit comments

Comments
 (0)