From af160c542e40c133b12b18d9dddd4fc555611ef1 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Tue, 28 Feb 2017 13:57:21 -0800 Subject: [PATCH] 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 Signed-off-by: Dmitry Torokhov --- drivers/input/touchscreen/ad7879-spi.c | 2 -- drivers/input/touchscreen/ad7879.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c index c737982..59486cc 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 1bd8702..52daaa4 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); -- 2.7.4