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 /drivers/irqchip | |
| parent | 4d8f509e7a5d2eb636d57ddb677e504a90a4f99d (diff) | |
| parent | 0d7c1210992ff05ee8de5d2c790defded3856f29 (diff) | |
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
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/irq-renesas-irqc.c | 4 |
1 files changed, 2 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: |