From: Jonathan Cameron <jic23@jic23.retrosnub.co.uk>
To: Michael Nosthoff <committed@heine.so>
Cc: linux-iio@vger.kernel.org, Shrirang Bagul <shrirang.bagul@canonical.com>
Subject: Re: [PATCH 2/2] iio: st_pressure: st_accel: pass correct platform data to init
Date: Sat, 10 Mar 2018 16:29:06 +0000 [thread overview]
Message-ID: <20180310162906.20364dd8@archlinux> (raw)
In-Reply-To: <500bb58a2dc6d70fa096d6a63321dc23@heine.so>
On Fri, 09 Mar 2018 10:02:45 +0100
Michael Nosthoff <committed@heine.so> wrote:
> Commit 7383d44b added a pointer pdata which get set to the default
> platform_data when non was defined in the device. But it did not
> pass this pointer to the st_sensors_init_sensor call but still
> used the maybe uninitialized platform_data from dev.
>
> This breaks initialization when no platform_data is given and
> the optional st,drdy-int-pin devicetree option is not set.
>
> This commit fixes this.
>
> Cc: stable@vger.kernel.org
> Fixes: 7383d44b ("iio: st_pressure: st_accel: Initialise sensor platform
> data properly")
> Signed-off-by: Michael Nosthoff <committed@heine.so>
Both patches were corrupted by your email client. I did the
revert directly and then manually applied this.
Thanks for tracking down the problem.
Applied to the fixes-togreg branch of iio.git.
Jonathan
> ---
> drivers/iio/accel/st_accel_core.c | 2 +-
> drivers/iio/pressure/st_pressure_core.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/accel/st_accel_core.c
> b/drivers/iio/accel/st_accel_core.c
> index 460aa58..3e6fd5a 100644
> --- a/drivers/iio/accel/st_accel_core.c
> +++ b/drivers/iio/accel/st_accel_core.c
> @@ -951,7 +951,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
> if (!pdata)
> pdata = (struct st_sensors_platform_data *)&default_accel_pdata;
>
> - err = st_sensors_init_sensor(indio_dev, adata->dev->platform_data);
> + err = st_sensors_init_sensor(indio_dev, pdata);
> if (err < 0)
> goto st_accel_power_off;
>
> diff --git a/drivers/iio/pressure/st_pressure_core.c
> b/drivers/iio/pressure/st_pressure_core.c
> index 349e5c7..4ddb6cf 100644
> --- a/drivers/iio/pressure/st_pressure_core.c
> +++ b/drivers/iio/pressure/st_pressure_core.c
> @@ -640,7 +640,7 @@ int st_press_common_probe(struct iio_dev *indio_dev)
> press_data->sensor_settings->drdy_irq.int2.addr))
> pdata = (struct st_sensors_platform_data *)&default_press_pdata;
>
> - err = st_sensors_init_sensor(indio_dev,
> press_data->dev->platform_data);
> + err = st_sensors_init_sensor(indio_dev, pdata);
> if (err < 0)
> goto st_press_power_off;
>
next prev parent reply other threads:[~2018-03-10 16:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-09 9:02 [PATCH 2/2] iio: st_pressure: st_accel: pass correct platform data to init Michael Nosthoff
2018-03-10 16:29 ` Jonathan Cameron [this message]
2018-03-12 9:08 ` Michael Nosthoff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180310162906.20364dd8@archlinux \
--to=jic23@jic23.retrosnub.co.uk \
--cc=committed@heine.so \
--cc=linux-iio@vger.kernel.org \
--cc=shrirang.bagul@canonical.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox