[PATCH] iio: pressure: bmp280: Fix incorrect pointer access in PM callbacks

[PATCH] iio: pressure: bmp280: Fix incorrect pointer access in PM callbacks

[Jarkko Nikula]

BMP280 runtime PM callbacks are incorrectly casting dev_get_drvdata() to
struct bmp280_data * while bmp280_common_probe() sets driver data to
struct iio_dev *. Fix this and get the struct bmp280_data * from private
data of struct iio_dev.

Fixes: 3d838118c6aa ("iio: pressure: bmp280: add power management")
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
For v4.8-rc.
---
 drivers/iio/pressure/bmp280-core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 6943688e66df..724fefd4af00 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -1079,7 +1079,8 @@ EXPORT_SYMBOL(bmp280_common_remove);
 #ifdef CONFIG_PM
 static int bmp280_runtime_suspend(struct device *dev)
 {
-	struct bmp280_data *data = dev_get_drvdata(dev);
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
+	struct bmp280_data *data = iio_priv(indio_dev);
 	int ret;
 
 	ret = regulator_disable(data->vdda);
@@ -1090,7 +1091,8 @@ static int bmp280_runtime_suspend(struct device *dev)
 
 static int bmp280_runtime_resume(struct device *dev)
 {
-	struct bmp280_data *data = dev_get_drvdata(dev);
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
+	struct bmp280_data *data = iio_priv(indio_dev);
 	int ret;
 
 	ret = regulator_enable(data->vddd);
-- 
2.8.1

Re: [PATCH] iio: pressure: bmp280: Fix incorrect pointer access in PM callbacks

[Linus Walleij]

On Fri, Aug 12, 2016 at 1:44 PM, Jarkko Nikula
<jarkko.nikula@linux.intel.com> wrote:

> BMP280 runtime PM callbacks are incorrectly casting dev_get_drvdata() to
> struct bmp280_data * while bmp280_common_probe() sets driver data to
> struct iio_dev *. Fix this and get the struct bmp280_data * from private
> data of struct iio_dev.
>
> Fixes: 3d838118c6aa ("iio: pressure: bmp280: add power management")
> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
> ---
> For v4.8-rc.

Sent a fix for this already two weeks ago:
http://marc.info/?l=linux-iio&m=146965159217655&w=2

Just waiting for it to be picked up and merged.

Yours,
Linus Walleij

Re: [PATCH] iio: pressure: bmp280: Fix incorrect pointer access in PM callbacks

[Jarkko Nikula]

On 08/12/2016 03:21 PM, Linus Walleij wrote:
> On Fri, Aug 12, 2016 at 1:44 PM, Jarkko Nikula
> <jarkko.nikula@linux.intel.com> wrote:
>
>> BMP280 runtime PM callbacks are incorrectly casting dev_get_drvdata() to
>> struct bmp280_data * while bmp280_common_probe() sets driver data to
>> struct iio_dev *. Fix this and get the struct bmp280_data * from private
>> data of struct iio_dev.
>>
>> Fixes: 3d838118c6aa ("iio: pressure: bmp280: add power management")
>> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
>> ---
>> For v4.8-rc.
>
> Sent a fix for this already two weeks ago:
> http://marc.info/?l=linux-iio&m=146965159217655&w=2
>
> Just waiting for it to be picked up and merged.
>
Ok, please feel free to add my tested by to your patch then

Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>

Re: [PATCH] iio: pressure: bmp280: Fix incorrect pointer access in PM callbacks

[Jonathan Cameron]

On 12/08/16 13:36, Jarkko Nikula wrote:
> On 08/12/2016 03:21 PM, Linus Walleij wrote:
>> On Fri, Aug 12, 2016 at 1:44 PM, Jarkko Nikula
>> <jarkko.nikula@linux.intel.com> wrote:
>>
>>> BMP280 runtime PM callbacks are incorrectly casting dev_get_drvdata() to
>>> struct bmp280_data * while bmp280_common_probe() sets driver data to
>>> struct iio_dev *. Fix this and get the struct bmp280_data * from private
>>> data of struct iio_dev.
>>>
>>> Fixes: 3d838118c6aa ("iio: pressure: bmp280: add power management")
>>> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
>>> ---
>>> For v4.8-rc.
>>
>> Sent a fix for this already two weeks ago:
>> http://marc.info/?l=linux-iio&m=146965159217655&w=2
>>
>> Just waiting for it to be picked up and merged.
>>
> Ok, please feel free to add my tested by to your patch then
> 
> Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Added.