Merge tag 'v4.5' into next

[linux-2.6-block.git] / drivers / input / touchscreen / ad7879.c

diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index cd013434473dfea1374c75f7078ee3d90c809fc7..69d299d5dd00b1a0dda797283cad911cce2ee4ca 100644 (file)
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -454,7 +454,7 @@ static int ad7879_gpio_add(struct ad7879 *ts,
                ts->gc.ngpio = 1;
                ts->gc.label = "AD7879-GPIO";
                ts->gc.owner = THIS_MODULE;
-               ts->gc.dev = ts->dev;
+               ts->gc.parent = ts->dev;
 
                ret = gpiochip_add(&ts->gc);
                if (ret)