tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Linus Walleij <linus.walleij@linaro.org>
+2
-2
+2
-2
drivers/gpio/gpio-tps65912.c
+2
-2
drivers/gpio/gpio-tps65912.c
···
117
117
gpio->gpio_chip = template_chip;
118
118
gpio->gpio_chip.parent = tps->dev;
119
119
120
-
ret = devm_gpiochip_add_data(&pdev->dev, &tps65912_gpio->gpio_chip,
121
-
tps65912_gpio);
120
+
ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gpio_chip,
121
+
gpio);
122
122
if (ret < 0) {
123
123
dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
124
124
return ret;