Commit 143b9d01 authored Jun 11, 2013 by Olof Johansson

Merge tag 'renesas-intc-external-irq-for-v3.11' of...

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

parents 4d8f509e 0d7c1210

drivers/irqchip/irq-renesas-irqc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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:

include/linux/irqchip.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -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

Admin message