Skip to content

Commit baf5cb3

Browse files
committed
MIPS: SNI: Fix SCSI interrupt
On RM400(a20r) machines ISA and SCSI interrupts share the same interrupt line. Commit 49e6e07 ("MIPS: pass non-NULL dev_id on shared request_irq()") accidently dropped the IRQF_SHARED bit, which breaks registering SCSI interrupt. Put back IRQF_SHARED and add dev_id for ISA interrupt. Fixes: 49e6e07 ("MIPS: pass non-NULL dev_id on shared request_irq()") Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent bb06748 commit baf5cb3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/mips/sni/a20r.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ void __init sni_a20r_irq_init(void)
222222
irq_set_chip_and_handler(i, &a20r_irq_type, handle_level_irq);
223223
sni_hwint = a20r_hwint;
224224
change_c0_status(ST0_IM, IE_IRQ0);
225-
if (request_irq(SNI_A20R_IRQ_BASE + 3, sni_isa_irq_handler, 0, "ISA",
226-
NULL))
225+
if (request_irq(SNI_A20R_IRQ_BASE + 3, sni_isa_irq_handler,
226+
IRQF_SHARED, "ISA", sni_isa_irq_handler))
227227
pr_err("Failed to register ISA interrupt\n");
228228
}
229229

0 commit comments

Comments
 (0)