Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 879dce79 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Tony Lindgren
Browse files

ARM: OMAP4+: PRM: fix of_irq_get() result checks 



of_irq_get() may return 0 as well as a nagative error number on failure,
(and never on success), however omap44xx_prm_late_init() regards 0 as a
valid IRQ -- fix this.

Fixes: a8f83aef ("ARM: OMAP4+: PRM: register interrupt information from DT")
Fixes: c5b39558 ("ARM: OMAP4: Fix legacy code clean-up regression")
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d683878d

arch/arm/mach-omap2/prm44xx.c

+2 −2
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ static int omap44xx_prm_late_init(void) 
	 * Already have OMAP4 IRQ num. For all other platforms, we need

	 * IRQ numbers from DT

	 */

	if (irq_num < 0 && !(prm_init_data->flags & PRM_IRQ_DEFAULT)) {

	if (irq_num <= 0 && !(prm_init_data->flags & PRM_IRQ_DEFAULT)) {

		if (irq_num == -EPROBE_DEFER)

			return irq_num;
@@ -756,7 +756,7 @@ static int omap44xx_prm_late_init(void) 
	}



	/* Once OMAP4 DT is filled as well */

	if (irq_num >= 0) {

	if (irq_num > 0) {

		omap4_prcm_irq_setup.irq = irq_num;

		omap4_prcm_irq_setup.xlate_irq = NULL;

	}