summaryrefslogtreecommitdiffstats
path: root/drivers/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-08-20 14:51:50 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-08-20 14:51:50 +0900
commitd4b7c5db429fbfd3c79120b27ccf66d583606b57 (patch)
tree8cb0f1a569bcafe72ec4f5dd1f9a65372fc02821 /drivers/sh
parent6dab7ede9390d4d937cb89feca932e4fd575d2da (diff)
downloadlinux-stable-d4b7c5db429fbfd3c79120b27ccf66d583606b57.tar.gz
linux-stable-d4b7c5db429fbfd3c79120b27ccf66d583606b57.tar.bz2
linux-stable-d4b7c5db429fbfd3c79120b27ccf66d583606b57.zip
sh: intc: Fix up multi-evt irq association.
In the multi-evt case we were accidentally associating the parent IRQ, fix this up. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/intc/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index 32c26d795ed0..8f32a1323a79 100644
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -355,7 +355,7 @@ int __init register_intc_controller(struct intc_desc *desc)
if (unlikely(res)) {
if (res == -EEXIST) {
res = irq_domain_associate(d->domain,
- irq, irq);
+ irq2, irq2);
if (unlikely(res)) {
pr_err("domain association "
"failure\n");