aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/cevt-r4k.c
diff options
context:
space:
mode:
authorafzal mohammed <afzal.mohd.ma@gmail.com>2020-03-14 13:43:12 +0530
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>2020-03-16 16:04:49 +0100
commit49e6e07e3c806c311e07da14a6d6e406ac9e719c (patch)
tree459d9fcb836127080e623345e253d83e7ba72de9 /arch/mips/kernel/cevt-r4k.c
parentMIPS: Replace setup_irq() by request_irq() (diff)
downloadlinux-dev-49e6e07e3c806c311e07da14a6d6e406ac9e719c.tar.xz
linux-dev-49e6e07e3c806c311e07da14a6d6e406ac9e719c.zip
MIPS: pass non-NULL dev_id on shared request_irq()
Recently all usages of setup_irq() was replaced by request_irq(). request_irq() does a few sanity checks that were not done in setup_irq(), if they fail irq registration will fail. One of the check is to ensure that non-NULL dev_id is passed in the case of shared irq. This caused malta on qemu to hang. Fix it by passing handler as dev_id to all request_irq()'s that are shared. For sni, instead of passing non-NULL dev_id, remove shared irq flags. Fixes: ac8fd122e070 ("MIPS: Replace setup_irq() by request_irq()") Reported-by: Nathan Chancellor <natechancellor@gmail.com> Suggested-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: afzal mohammed <afzal.mohd.ma@gmail.com> Tested-by: Guenter Roeck <linux@roeck-us.net> Tested-by: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'arch/mips/kernel/cevt-r4k.c')
-rw-r--r--arch/mips/kernel/cevt-r4k.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
index 64e917dfe6b2..17a9cbb8b3df 100644
--- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c
@@ -292,7 +292,8 @@ int r4k_clockevent_init(void)
cp0_timer_irq_installed = 1;
- if (request_irq(irq, c0_compare_interrupt, flags, "timer", NULL))
+ if (request_irq(irq, c0_compare_interrupt, flags, "timer",
+ c0_compare_interrupt))
pr_err("Failed to request irq %d (timer)\n", irq);
return 0;