[PATCH] iio: adc: ti-ads1015: fix incorrect referencing of ads1015_data pointer

[PATCH] iio: adc: ti-ads1015: fix incorrect referencing of ads1015_data pointer

[Matt Ranostay]

Reported-by: Giorgio <giorgio.nicole@arcor.de>
Cc: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
---
 drivers/iio/adc/ti-ads1015.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
index 73cbf0b54e54..fe96af6059d5 100644
--- a/drivers/iio/adc/ti-ads1015.c
+++ b/drivers/iio/adc/ti-ads1015.c
@@ -403,7 +403,8 @@ static const struct iio_info ads1015_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 ||
-- 
2.7.4

Re: [PATCH] iio: adc: ti-ads1015: fix incorrect referencing of ads1015_data pointer

[Daniel Baluta]

On Fri, Jul 29, 2016 at 1:40 AM, Matt Ranostay <mranostay@gmail.com> wrote:
> Reported-by: Giorgio <giorgio.nicole@arcor.de>
> Cc: Daniel Baluta <daniel.baluta@intel.com>
> Signed-off-by: Matt Ranostay <mranostay@gmail.com>
> ---
>  drivers/iio/adc/ti-ads1015.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
> index 73cbf0b54e54..fe96af6059d5 100644
> --- a/drivers/iio/adc/ti-ads1015.c
> +++ b/drivers/iio/adc/ti-ads1015.c
> @@ -403,7 +403,8 @@ static const struct iio_info ads1015_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 ||
> --

Hi Matt,

Giorgio already sent a patch for this. I think we should go on his way
since he found the bug.

Daniel.

Re: [PATCH] iio: adc: ti-ads1015: fix incorrect referencing of ads1015_data pointer

[Matt Ranostay]

On Thu, Jul 28, 2016 at 11:19 PM, Daniel Baluta <daniel.baluta@intel.com> wrote:
> On Fri, Jul 29, 2016 at 1:40 AM, Matt Ranostay <mranostay@gmail.com> wrote:
>> Reported-by: Giorgio <giorgio.nicole@arcor.de>
>> Cc: Daniel Baluta <daniel.baluta@intel.com>
>> Signed-off-by: Matt Ranostay <mranostay@gmail.com>
>> ---
>>  drivers/iio/adc/ti-ads1015.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
>> index 73cbf0b54e54..fe96af6059d5 100644
>> --- a/drivers/iio/adc/ti-ads1015.c
>> +++ b/drivers/iio/adc/ti-ads1015.c
>> @@ -403,7 +403,8 @@ static const struct iio_info ads1015_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 ||
>> --
>
> Hi Matt,
>
> Giorgio already sent a patch for this. I think we should go on his way
> since he found the bug.

Ah! see both a bug report and patch earlier now :)

Although do you know if there are anymore drivers we had to make a iio
version of hwmon for the triggered buffer? I suspect this was a simple
copy and paste error from the hwmon driver

>
> Daniel.

[PATCH 1/1] iio:ti-ads1015: fix a wrong pointer definition.

[Giorgio Dal Molin]

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>
---
 drivers/iio/adc/ti-ads1015.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
index 1ef39877..066abaf 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 ||
-- 
2.9.3

Re: [PATCH 1/1] iio:ti-ads1015: fix a wrong pointer definition.

[Jonathan Cameron]

On 16/08/16 19:43, Giorgio Dal Molin wrote:
> 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>
Applied with the addition of a fixes tag to the fixes-togreg branch
of iio.git.

I've also marked this for stable.

Thanks,

Jonathan
> ---
>  drivers/iio/adc/ti-ads1015.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
> index 1ef39877..066abaf 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 ||
>