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>
This commit is contained in:
parent
70aba44b6c
commit
9d93efe35e
|
@ -117,8 +117,8 @@ static int tps65912_gpio_probe(struct platform_device *pdev)
|
||||||
gpio->gpio_chip = template_chip;
|
gpio->gpio_chip = template_chip;
|
||||||
gpio->gpio_chip.parent = tps->dev;
|
gpio->gpio_chip.parent = tps->dev;
|
||||||
|
|
||||||
ret = devm_gpiochip_add_data(&pdev->dev, &tps65912_gpio->gpio_chip,
|
ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gpio_chip,
|
||||||
tps65912_gpio);
|
gpio);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
|
dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in New Issue