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

Commit 8327e1ba authored by Keerthy's avatar Keerthy Committed by Linus Walleij
Browse files

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: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1a20c3f8

drivers/gpio/gpio-davinci.c

+12 −2
Original line number Original line Diff line number Diff line
@@ -166,7 +166,7 @@ davinci_gpio_get_pdata(struct platform_device *pdev) 
static int davinci_gpio_probe(struct platform_device *pdev)

static int davinci_gpio_probe(struct platform_device *pdev)

{

{

	static int ctrl_num, bank_base;

	static int ctrl_num, bank_base;

	int gpio, bank;

	int gpio, bank, ret = 0;

	unsigned ngpio, nbank;

	unsigned ngpio, nbank;

	struct davinci_gpio_controller *chips;

	struct davinci_gpio_controller *chips;

	struct davinci_gpio_platform_data *pdata;

	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++)

	for (gpio = 0, bank = 0; gpio < ngpio; gpio += 32, bank++)

		chips->regs[bank] = gpio_base + offset_array[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);

	platform_set_drvdata(pdev, chips);

	davinci_gpio_irq_setup(pdev);

	davinci_gpio_irq_setup(pdev);

	return 0;

	return 0;



err:

	/* Revert the static variable increments */

	ctrl_num--;

	bank_base -= ngpio;



	return ret;

}

}





/*--------------------------------------------------------------------------*/

/*--------------------------------------------------------------------------*/