diff options
| author | Keerthy <j-keerthy@ti.com> | 2017-07-20 15:12:16 +0530 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-08-14 15:01:12 +0200 |
| commit | 8327e1ba12aa0e513e517fc254c053fecb0d2df5 (patch) | |
| tree | 6d4df8a2a4f3422dad8b8aca47d791f183ab544e | |
| parent | 1a20c3f8e8c28357b63829ae4b16a212a4a7ef31 (diff) | |
| download | linux-8327e1ba12aa0e513e517fc254c053fecb0d2df5.tar.bz2 | |
gpio: davinci: Use devm_gpiochip_add_data in place of gpiochip_add_data
Use the devm version of gpiochip_add_data and pass on the
return value. This avoids memory leak due to gpiochip_add_data
in case the driver is unbound.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/gpio/gpio-davinci.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 65cb359308e3..27499ecc3c5e 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c @@ -166,7 +166,7 @@ of_err: static int davinci_gpio_probe(struct platform_device *pdev) { static int ctrl_num, bank_base; - int gpio, bank; + int gpio, bank, ret = 0; unsigned ngpio, nbank; struct davinci_gpio_controller *chips; struct davinci_gpio_platform_data *pdata; @@ -232,10 +232,20 @@ static int davinci_gpio_probe(struct platform_device *pdev) for (gpio = 0, bank = 0; gpio < ngpio; gpio += 32, bank++) chips->regs[bank] = gpio_base + offset_array[bank]; - gpiochip_add_data(&chips->chip, chips); + ret = devm_gpiochip_add_data(dev, &chips->chip, chips); + if (ret) + goto err; + platform_set_drvdata(pdev, chips); davinci_gpio_irq_setup(pdev); return 0; + +err: + /* Revert the static variable increments */ + ctrl_num--; + bank_base -= ngpio; + + return ret; } /*--------------------------------------------------------------------------*/ |