diff options
| author |   Olof Johansson <olof@lixom.net> | 2013-06-11 00:08:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-11 00:08:32 -0700 |
| commit | 143b9d01211b883cc56343ca5df25b156bf193ff (patch) | |
| tree | 296583c4600399d9944217f42154e21eb199b866 | |
| parent | Merge tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/fixes-non-critical (diff) | |
| parent | irqchip: Add irqchip_init dummy function (diff) | |
| download | wireguard-linux-143b9d01211b883cc56343ca5df25b156bf193ff.tar.xz wireguard-linux-143b9d01211b883cc56343ca5df25b156bf193ff.zip | |
Merge tag 'renesas-intc-external-irq-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical
From Simon Horman:
Update for Renesas INTC External IRQ pin driver for v3.11
- Correct error handing in irqc_probe
- Add irqchip_init dummy function
* tag 'renesas-intc-external-irq-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
irqchip: Add irqchip_init dummy function
irqchip: renesas-irqc: Fix irqc_probe error handling
| -rw-r--r-- | drivers/irqchip/irq-renesas-irqc.c | 4 | ||||
| -rw-r--r-- | include/linux/irqchip.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c index 927bff373aac..2f404ba61c6c 100644 --- a/drivers/irqchip/irq-renesas-irqc.c +++ b/drivers/irqchip/irq-renesas-irqc.c @@ -248,8 +248,8 @@ static int irqc_probe(struct platform_device *pdev) return 0; err3: - for (; k >= 0; k--) - free_irq(p->irq[k - 1].requested_irq, &p->irq[k - 1]); + while (--k >= 0) + free_irq(p->irq[k].requested_irq, &p->irq[k]); irq_domain_remove(p->irq_domain); err2: diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h index e0006f1d35a0..14d79131f53d 100644 --- a/include/linux/irqchip.h +++ b/include/linux/irqchip.h @@ -11,6 +11,10 @@ #ifndef _LINUX_IRQCHIP_H #define _LINUX_IRQCHIP_H +#ifdef CONFIG_IRQCHIP void irqchip_init(void); +#else +static inline void irqchip_init(void) {} +#endif #endif |