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

Commit 9d93efe3 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: tps65912: fix bad merge 



I screwed up while merging the immutable branch for TPS65912,
so fixing it unbroken again.

Cc: Lee Jones <lee.jones@linaro.org>
Cc: Andrew F. Davis <afd@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 70aba44b

drivers/gpio/gpio-tps65912.c

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ static int tps65912_gpio_probe(struct platform_device *pdev) 
	gpio->gpio_chip = template_chip;

	gpio->gpio_chip.parent = tps->dev;



	ret = devm_gpiochip_add_data(&pdev->dev, &tps65912_gpio->gpio_chip,

				     tps65912_gpio);

	ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gpio_chip,

				     gpio);

	if (ret < 0) {

		dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);

		return ret;