summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-02-28 13:57:21 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-03-01 09:42:43 -0800
commitaf160c542e40c133b12b18d9dddd4fc555611ef1 (patch)
tree81f647badef896d23588eea196f903a58df4a7a3 /drivers/input/touchscreen
parent6afb6b6ed866c743629b4dd9ac381e418222cc98 (diff)
downloadlinux-af160c542e40c133b12b18d9dddd4fc555611ef1.tar.bz2
Input: ad7879 - make sure we set up drvdata
The conversion to devm accidentally removed setting up of I2C client data upon successful probe of the touchscreen. Let's move this setting into the core, so we do not forger about it again. Fixes: 381f688eee3d ("Input: ad7879 - use more devm interfaces") Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/ad7879-spi.c2
-rw-r--r--drivers/input/touchscreen/ad7879.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c
index c73798297b98..59486ccba37d 100644
--- a/drivers/input/touchscreen/ad7879-spi.c
+++ b/drivers/input/touchscreen/ad7879-spi.c
@@ -49,8 +49,6 @@ static int ad7879_spi_probe(struct spi_device *spi)
if (IS_ERR(ts))
return PTR_ERR(ts);
- spi_set_drvdata(spi, ts);
-
return 0;
}
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index 1bd870277e1a..52daaa4edc67 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -680,6 +680,8 @@ struct ad7879 *ad7879_probe(struct device *dev, struct regmap *regmap,
if (err)
return ERR_PTR(err);
+ dev_set_drvdata(dev, ts);
+
return 0;
}
EXPORT_SYMBOL(ad7879_probe);