From: Jonathan Cameron <jic23@kernel.org>
To: Lorenzo Bianconi <lorenzo@kernel.org>
Cc: lorenzo.bianconi@redhat.com, linux-iio@vger.kernel.org
Subject: Re: [PATCH] iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw
Date: Sat, 2 Nov 2019 15:58:20 +0000 [thread overview]
Message-ID: <20191102155820.7186f1f6@archlinux> (raw)
In-Reply-To: <eda7fb795fb47c41b6c6d617255cb8eec486c355.1572199100.git.lorenzo@kernel.org>
On Sun, 27 Oct 2019 19:02:30 +0100
Lorenzo Bianconi <lorenzo@kernel.org> wrote:
> Since st_lsm6dsx i2c master controller relies on accel device as trigger
> and slave devices can run at different ODRs we must select an accel_odr >=
> slave_odr. Report real accel ODR in st_lsm6dsx_check_odr() in order to
> properly set sensor frequency in st_lsm6dsx_write_raw and avoid to
> report unsupported frequency
>
> Fixes: 6ffb55e5009ff ("iio: imu: st_lsm6dsx: introduce ST_LSM6DSX_ID_EXT sensor ids")
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Given time in cycle I 'might' shift this into togreg to go in during the
merge window.
Thanks,
Jonathan
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index 1f28a7733fc0..c53c03ec2423 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -1362,8 +1362,7 @@ int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val)
> return -EINVAL;
>
> *val = odr_table->odr_avl[i].val;
> -
> - return 0;
> + return odr_table->odr_avl[i].hz;
> }
>
> static u16 st_lsm6dsx_check_odr_dependency(struct st_lsm6dsx_hw *hw, u16 odr,
> @@ -1527,8 +1526,10 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev,
> case IIO_CHAN_INFO_SAMP_FREQ: {
> u8 data;
>
> - err = st_lsm6dsx_check_odr(sensor, val, &data);
> - if (!err)
> + val = st_lsm6dsx_check_odr(sensor, val, &data);
> + if (val < 0)
> + err = val;
> + else
> sensor->odr = val;
> break;
> }
prev parent reply other threads:[~2019-11-02 15:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 18:02 [PATCH] iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw Lorenzo Bianconi
2019-11-02 15:58 ` Jonathan Cameron [this message]
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=20191102155820.7186f1f6@archlinux \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=lorenzo@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.