[PATCH] irqchip: bcm7120-l2: fix error handling of irq_of_parse_and_map

[PATCH] irqchip: bcm7120-l2: fix error handling of irq_of_parse_and_map

[Dmitry Torokhov]

Return value of irq_of_parse_and_map() is unsigned int, with 0
indicating failure, so testing for negative result never works.

Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
---

Not tested, found by casual code inspection.

 drivers/irqchip/irq-bcm7120-l2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
index e7c6155..8eec8e1 100644
--- a/drivers/irqchip/irq-bcm7120-l2.c
+++ b/drivers/irqchip/irq-bcm7120-l2.c
@@ -102,9 +102,9 @@ static int bcm7120_l2_intc_init_one(struct device_node *dn,
 	unsigned int idx;
 
 	parent_irq = irq_of_parse_and_map(dn, irq);
-	if (parent_irq < 0) {
+	if (!parent_irq) {
 		pr_err("failed to map interrupt %d\n", irq);
-		return parent_irq;
+		return -EINVAL;
 	}
 
 	/* For multiple parent IRQs with multiple words, this looks like:
-- 
2.1.0.rc2.206.gedb03e5


-- 
Dmitry

Re: [PATCH] irqchip: bcm7120-l2: fix error handling of irq_of_parse_and_map

[Florian Fainelli]

2014-11-14 14:16 GMT-08:00 Dmitry Torokhov <dtor@chromium.org>:
> Return value of irq_of_parse_and_map() is unsigned int, with 0
> indicating failure, so testing for negative result never works.
>
> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

> ---
>
> Not tested, found by casual code inspection.
>
>  drivers/irqchip/irq-bcm7120-l2.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
> index e7c6155..8eec8e1 100644
> --- a/drivers/irqchip/irq-bcm7120-l2.c
> +++ b/drivers/irqchip/irq-bcm7120-l2.c
> @@ -102,9 +102,9 @@ static int bcm7120_l2_intc_init_one(struct device_node *dn,
>         unsigned int idx;
>
>         parent_irq = irq_of_parse_and_map(dn, irq);
> -       if (parent_irq < 0) {
> +       if (!parent_irq) {
>                 pr_err("failed to map interrupt %d\n", irq);
> -               return parent_irq;
> +               return -EINVAL;
>         }
>
>         /* For multiple parent IRQs with multiple words, this looks like:
> --
> 2.1.0.rc2.206.gedb03e5
>
>
> --
> Dmitry



-- 
Florian

Re: [PATCH] irqchip: bcm7120-l2: fix error handling of irq_of_parse_and_map

[Kevin Cernekee]

On Fri, Nov 14, 2014 at 2:16 PM, Dmitry Torokhov <dtor@chromium.org> wrote:
> Return value of irq_of_parse_and_map() is unsigned int, with 0
> indicating failure, so testing for negative result never works.
>
> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> ---
>
> Not tested, found by casual code inspection.
>
>  drivers/irqchip/irq-bcm7120-l2.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
> index e7c6155..8eec8e1 100644
> --- a/drivers/irqchip/irq-bcm7120-l2.c
> +++ b/drivers/irqchip/irq-bcm7120-l2.c
> @@ -102,9 +102,9 @@ static int bcm7120_l2_intc_init_one(struct device_node *dn,
>         unsigned int idx;
>
>         parent_irq = irq_of_parse_and_map(dn, irq);
> -       if (parent_irq < 0) {
> +       if (!parent_irq) {
>                 pr_err("failed to map interrupt %d\n", irq);
> -               return parent_irq;
> +               return -EINVAL;
>         }
>
>         /* For multiple parent IRQs with multiple words, this looks like:

Hi Dmitry,

Thanks for the review.  For this patch and for your irq-brcmstb-l2.c
patch, I'll add:

Tested-by: Kevin Cernekee <cernekee@gmail.com>

The same bug also showed up in my new irq-bcm7038-l1.c driver; it will
be fixed in the initial submission.

Re: [PATCH] irqchip: bcm7120-l2: fix error handling of irq_of_parse_and_map

[Jason Cooper]

On Fri, Nov 14, 2014 at 02:16:14PM -0800, Dmitry Torokhov wrote:
> Return value of irq_of_parse_and_map() is unsigned int, with 0
> indicating failure, so testing for negative result never works.
> 
> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> ---
> 
> Not tested, found by casual code inspection.
> 
>  drivers/irqchip/irq-bcm7120-l2.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Both applied to irqchip/urgent with Florian's Ack and Kevin's Tested-by.

thx,

Jason.