summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpio-tps65912.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-03-09 18:02:52 +0300
committerLinus Walleij <linus.walleij@linaro.org>2016-03-09 18:02:52 +0300
commit9d93efe35ed011327999675d70bb1b12ccdbd62d (patch)
tree619e3a808e227aa9f709aa98c30662c24ac7d1e0 /drivers/gpio/gpio-tps65912.c
parent70aba44b6cade8dc63261c4f97d5e83b0c02d07a (diff)
downloadlinux-9d93efe35ed011327999675d70bb1b12ccdbd62d.tar.xz
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>
Diffstat (limited to 'drivers/gpio/gpio-tps65912.c')
-rw-r--r--drivers/gpio/gpio-tps65912.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c
index e7886e712dc7..acfd30a13a56 100644
--- a/drivers/gpio/gpio-tps65912.c
+++ b/drivers/gpio/gpio-tps65912.c
@@ -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;