From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751710AbdB1WSW (ORCPT ); Tue, 28 Feb 2017 17:18:22 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:34590 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751529AbdB1WSQ (ORCPT ); Tue, 28 Feb 2017 17:18:16 -0500 From: Dmitry Torokhov To: Michael Hennerich Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] Input: ad7879 - make sure we set up drvdata Date: Tue, 28 Feb 2017 14:08:45 -0800 Message-Id: <20170228220848.31185-1-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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") 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 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); -- 2.11.0.483.g087da7b7c-goog