diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-08-20 07:51:50 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-08-20 07:51:50 +0200 |
| commit | d4b7c5db429fbfd3c79120b27ccf66d583606b57 (patch) | |
| tree | 8cb0f1a569bcafe72ec4f5dd1f9a65372fc02821 /drivers/sh/intc | |
| parent | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
| download | linux-d4b7c5db429fbfd3c79120b27ccf66d583606b57.tar.xz linux-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/intc')
| -rw-r--r-- | drivers/sh/intc/core.c | 2 |
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"); |