From 9d93efe35ed011327999675d70bb1b12ccdbd62d Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 9 Mar 2016 22:02:52 +0700 Subject: gpio: tps65912: fix bad merge I screwed up while merging the immutable branch for TPS65912, so fixing it unbroken again. Cc: Lee Jones Cc: Andrew F. Davis Signed-off-by: Linus Walleij --- drivers/gpio/gpio-tps65912.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpio') 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; -- cgit v1.2.3-59-g8ed1b