From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 20 Aug 2012 05:51:50 +0000 (+0900)
Subject: sh: intc: Fix up multi-evt irq association.
X-Git-Tag: next-20120821~87^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d4b7c5db429fbfd3c79120b27ccf66d583606b57;p=karo-tx-linux.git

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>
---

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");