summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiorgio Dal Molin <giorgio.nicole@arcor.de>2016-08-16 20:43:37 +0200
committerJonathan Cameron <jic23@kernel.org>2016-08-21 12:00:45 +0200
commit522caebb2c3684f4a1d154526fb5e33f1381e92a (patch)
treeebdb600c0d9709f2cd5a5795890b410d11a2d189
parentiio: adc: at91: unbreak channel adc channel 3 (diff)
downloadlinux-522caebb2c3684f4a1d154526fb5e33f1381e92a.tar.xz
linux-522caebb2c3684f4a1d154526fb5e33f1381e92a.zip
iio:ti-ads1015: fix a wrong pointer definition.
The call to i2c_get_clientdata(client) returns a struct iio_dev*, not the needed struct ads1015_data*. We need here an intermediate step as in the function: void ads1015_get_channels_config(struct i2c_client *client). Signed-off-by: Giorgio Dal Molin <giorgio.nicole@arcor.de> Fixes: ecc24e72f437 ("iio: adc: Add TI ADS1015 ADC driver support") Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/adc/ti-ads1015.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
index 1ef398770a1f..066abaf80201 100644
--- a/drivers/iio/adc/ti-ads1015.c
+++ b/drivers/iio/adc/ti-ads1015.c
@@ -489,7 +489,8 @@ static struct iio_info ads1115_info = {
#ifdef CONFIG_OF
static int ads1015_get_channels_config_of(struct i2c_client *client)
{
- struct ads1015_data *data = i2c_get_clientdata(client);
+ struct iio_dev *indio_dev = i2c_get_clientdata(client);
+ struct ads1015_data *data = iio_priv(indio_dev);
struct device_node *node;
if (!client->dev.of_node ||