2017-08-09 22:53:06

by Masahiro Yamada

Subject: [PATCH] gpio: brcmstb: check return value of gpiochip_irqchip_add()

Because gpiochip_irqchip_add() may fail, its return value should
be checked.

Signed-off-by: Masahiro Yamada <[email protected]>
---

drivers/gpio/gpio-brcmstb.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
index e6489143721a..51485997f680 100644
--- a/drivers/gpio/gpio-brcmstb.c
+++ b/drivers/gpio/gpio-brcmstb.c
@@ -339,6 +339,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
struct brcmstb_gpio_priv *priv = bank->parent_priv;
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
+ int err;

bank->irq_chip.name = dev_name(dev);
bank->irq_chip.irq_mask = brcmstb_gpio_irq_mask;
@@ -355,8 +356,6 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
dev_warn(dev,
"Couldn't get wake IRQ - GPIOs will not be able to wake from sleep");
} else {
- int err;
-
/*
* Set wakeup capability before requesting wakeup
* interrupt, so we can process boot-time "wakeups"
@@ -383,8 +382,10 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
if (priv->can_wake)
bank->irq_chip.irq_set_wake = brcmstb_gpio_irq_set_wake;

- gpiochip_irqchip_add(&bank->gc, &bank->irq_chip, 0,
- handle_simple_irq, IRQ_TYPE_NONE);
+ err = gpiochip_irqchip_add(&bank->gc, &bank->irq_chip, 0,
+ handle_simple_irq, IRQ_TYPE_NONE);
+ if (err)
+ return err;
gpiochip_set_chained_irqchip(&bank->gc, &bank->irq_chip,
priv->parent_irq, brcmstb_gpio_irq_handler);

--
2.7.4

2017-08-16 06:09:22

by Gregory Fong

Subject: Re: [PATCH] gpio: brcmstb: check return value of gpiochip_irqchip_add()

On Wed, Aug 9, 2017 at 3:51 PM, Masahiro Yamada
<[email protected]> wrote:
> Because gpiochip_irqchip_add() may fail, its return value should
> be checked.
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Acked-by: Gregory Fong <[email protected]>

2017-08-22 13:10:51

by Linus Walleij

Subject: Re: [PATCH] gpio: brcmstb: check return value of gpiochip_irqchip_add()

On Thu, Aug 10, 2017 at 12:51 AM, Masahiro Yamada
<[email protected]> wrote:

> Because gpiochip_irqchip_add() may fail, its return value should
> be checked.
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Patch applied with Gregory's ACK.

Yours,
Linus Walleij