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>

diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c
index e7886e712dc7b8750dcdb54784295c898cccabec..acfd30a13a567902571c531ae5ac8052d0863375 100644 (file)
--- 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;