summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorAlexander Stein <alexanders83@web.de>2014-04-13 00:42:24 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-04-20 00:55:59 +0400
commit2fdf4cd9a2afb113e566dfe6ee5df55ada8c0631 (patch)
tree35e240671fb564bfdcbbb0109fdbc083d0170a17 /drivers/input/touchscreen
parent06491e84f0f95dbe105b74fef32e7063e349f2d7 (diff)
downloadlinux-2fdf4cd9a2afb113e566dfe6ee5df55ada8c0631.tar.xz
Input: ads7846 - fix device usage within attribute show
With commit e585c40ba (Input: ads7846 - convert to hwmon_device_register_with_groups()) the device passed to the attribute's show function isn't the spi device as before. So fixup the passed device to ads7846_read12_ser. Signed-off-by: Alexander Stein <alexanders83@web.de> Acked-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/ads7846.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 45a06e495ed2..7f8aa981500d 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -425,7 +425,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command)
name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \
{ \
struct ads7846 *ts = dev_get_drvdata(dev); \
- ssize_t v = ads7846_read12_ser(dev, \
+ ssize_t v = ads7846_read12_ser(&ts->spi->dev, \
READ_12BIT_SER(var)); \
if (v < 0) \
return v; \