diff mbox

omap: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array

Message ID 1357252342-6166-1-git-send-email-panto@antoniou-consulting.com (mailing list archive)
State New, archived
Headers show

Commit Message

Pantelis Antoniou Jan. 3, 2013, 10:32 p.m. UTC
The IRQ array must be terminated by -1 and not by -1+OMAP_INTC_START
This led to having a resource list of 100s of IRQs.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
---
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tony Lindgren Jan. 7, 2013, 8:03 p.m. UTC | #1
* Pantelis Antoniou <panto@antoniou-consulting.com> [130103 14:35]:
> The IRQ array must be terminated by -1 and not by -1+OMAP_INTC_START
> This led to having a resource list of 100s of IRQs.

This is a bug for sure introduced with commit a2cfc509 (ARM: OMAP3+:
hwmod: Add AM33XX HWMOD data). Anybody care to ack this one?

Regards,

Tony
 
> Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
> ---
>  arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
> index 081c71e..e402303 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
> @@ -2070,7 +2070,7 @@ static struct omap_hwmod_irq_info am33xx_usbss_mpu_irqs[] = {
>  	{ .name = "usbss-irq", .irq = 17 + OMAP_INTC_START, },
>  	{ .name = "musb0-irq", .irq = 18 + OMAP_INTC_START, },
>  	{ .name = "musb1-irq", .irq = 19 + OMAP_INTC_START, },
> -	{ .irq = -1 + OMAP_INTC_START, },
> +	{ .irq = -1, },
>  };
>  
>  static struct omap_hwmod am33xx_usbss_hwmod = {
> -- 
> 1.7.12
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paul Walmsley Jan. 7, 2013, 8:09 p.m. UTC | #2
On Mon, 7 Jan 2013, Tony Lindgren wrote:

> * Pantelis Antoniou <panto@antoniou-consulting.com> [130103 14:35]:
> > The IRQ array must be terminated by -1 and not by -1+OMAP_INTC_START
> > This led to having a resource list of 100s of IRQs.
> 
> This is a bug for sure introduced with commit a2cfc509 (ARM: OMAP3+:
> hwmod: Add AM33XX HWMOD data). Anybody care to ack this one?

Acked-by: Paul Walmsley <paul@pwsan.com>


- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren Jan. 7, 2013, 8:40 p.m. UTC | #3
* Paul Walmsley <paul@pwsan.com> [130107 12:12]:
> On Mon, 7 Jan 2013, Tony Lindgren wrote:
> 
> > * Pantelis Antoniou <panto@antoniou-consulting.com> [130103 14:35]:
> > > The IRQ array must be terminated by -1 and not by -1+OMAP_INTC_START
> > > This led to having a resource list of 100s of IRQs.
> > 
> > This is a bug for sure introduced with commit a2cfc509 (ARM: OMAP3+:
> > hwmod: Add AM33XX HWMOD data). Anybody care to ack this one?
> 
> Acked-by: Paul Walmsley <paul@pwsan.com>

Thanks applying into omap-for-v3.8-rc2/fixes.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 081c71e..e402303 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -2070,7 +2070,7 @@  static struct omap_hwmod_irq_info am33xx_usbss_mpu_irqs[] = {
 	{ .name = "usbss-irq", .irq = 17 + OMAP_INTC_START, },
 	{ .name = "musb0-irq", .irq = 18 + OMAP_INTC_START, },
 	{ .name = "musb1-irq", .irq = 19 + OMAP_INTC_START, },
-	{ .irq = -1 + OMAP_INTC_START, },
+	{ .irq = -1, },
 };
 
 static struct omap_hwmod am33xx_usbss_hwmod = {