Skip to content

Commit

Permalink
gpio: tps65912: fix bad merge
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Linus Walleij committed Mar 9, 2016
1 parent 70aba44 commit 9d93efe
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpio/gpio-tps65912.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9d93efe

Please sign in to comment.