* [PATCH] iio: adis16475: fix deadlock on frequency set
@ 2021-09-20 9:00 Nuno Sá
2021-09-20 11:42 ` Alexandru Ardelean
0 siblings, 1 reply; 3+ messages in thread
From: Nuno Sá @ 2021-09-20 9:00 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Michael Hennerich, Lars-Peter Clausen
With commit 39c024b51b560
("iio: adis16475: improve sync scale mode handling"), two deadlocks were
introduced:
1) The call to 'adis_write_reg_16()' was not changed to it's unlocked
version.
2) The lock was not being released on the success path of the function.
This change fixes both these issues.
Fixes: 39c024b51b560 ("iio: adis16475: improve sync scale mode handling")
Signed-off-by: Nuno Sá <nuno.sa@analog.com>
---
drivers/iio/imu/adis16475.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/imu/adis16475.c b/drivers/iio/imu/adis16475.c
index eb48102f9424..287fff39a927 100644
--- a/drivers/iio/imu/adis16475.c
+++ b/drivers/iio/imu/adis16475.c
@@ -353,10 +353,11 @@ static int adis16475_set_freq(struct adis16475 *st, const u32 freq)
if (dec > st->info->max_dec)
dec = st->info->max_dec;
- ret = adis_write_reg_16(&st->adis, ADIS16475_REG_DEC_RATE, dec);
+ ret = __adis_write_reg_16(&st->adis, ADIS16475_REG_DEC_RATE, dec);
if (ret)
goto error;
+ adis_dev_unlock(&st->adis);
/*
* If decimation is used, then gyro and accel data will have meaningful
* bits on the LSB registers. This info is used on the trigger handler.
--
2.33.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] iio: adis16475: fix deadlock on frequency set
2021-09-20 9:00 [PATCH] iio: adis16475: fix deadlock on frequency set Nuno Sá
@ 2021-09-20 11:42 ` Alexandru Ardelean
2021-09-25 15:01 ` Jonathan Cameron
0 siblings, 1 reply; 3+ messages in thread
From: Alexandru Ardelean @ 2021-09-20 11:42 UTC (permalink / raw)
To: Nuno Sá
Cc: linux-iio, Jonathan Cameron, Michael Hennerich,
Lars-Peter Clausen
On Mon, Sep 20, 2021 at 12:59 PM Nuno Sá <nuno.sa@analog.com> wrote:
>
> With commit 39c024b51b560
> ("iio: adis16475: improve sync scale mode handling"), two deadlocks were
> introduced:
> 1) The call to 'adis_write_reg_16()' was not changed to it's unlocked
> version.
> 2) The lock was not being released on the success path of the function.
>
> This change fixes both these issues.
>
Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com>
> Fixes: 39c024b51b560 ("iio: adis16475: improve sync scale mode handling")
> Signed-off-by: Nuno Sá <nuno.sa@analog.com>
> ---
> drivers/iio/imu/adis16475.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/imu/adis16475.c b/drivers/iio/imu/adis16475.c
> index eb48102f9424..287fff39a927 100644
> --- a/drivers/iio/imu/adis16475.c
> +++ b/drivers/iio/imu/adis16475.c
> @@ -353,10 +353,11 @@ static int adis16475_set_freq(struct adis16475 *st, const u32 freq)
> if (dec > st->info->max_dec)
> dec = st->info->max_dec;
>
> - ret = adis_write_reg_16(&st->adis, ADIS16475_REG_DEC_RATE, dec);
> + ret = __adis_write_reg_16(&st->adis, ADIS16475_REG_DEC_RATE, dec);
> if (ret)
> goto error;
>
> + adis_dev_unlock(&st->adis);
> /*
> * If decimation is used, then gyro and accel data will have meaningful
> * bits on the LSB registers. This info is used on the trigger handler.
> --
> 2.33.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] iio: adis16475: fix deadlock on frequency set
2021-09-20 11:42 ` Alexandru Ardelean
@ 2021-09-25 15:01 ` Jonathan Cameron
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2021-09-25 15:01 UTC (permalink / raw)
To: Alexandru Ardelean
Cc: Nuno Sá, linux-iio, Michael Hennerich, Lars-Peter Clausen
On Mon, 20 Sep 2021 14:42:25 +0300
Alexandru Ardelean <ardeleanalex@gmail.com> wrote:
> On Mon, Sep 20, 2021 at 12:59 PM Nuno Sá <nuno.sa@analog.com> wrote:
> >
> > With commit 39c024b51b560
> > ("iio: adis16475: improve sync scale mode handling"), two deadlocks were
> > introduced:
> > 1) The call to 'adis_write_reg_16()' was not changed to it's unlocked
> > version.
> > 2) The lock was not being released on the success path of the function.
> >
> > This change fixes both these issues.
> >
>
> Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,
Jonathan
>
> > Fixes: 39c024b51b560 ("iio: adis16475: improve sync scale mode handling")
> > Signed-off-by: Nuno Sá <nuno.sa@analog.com>
> > ---
> > drivers/iio/imu/adis16475.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/iio/imu/adis16475.c b/drivers/iio/imu/adis16475.c
> > index eb48102f9424..287fff39a927 100644
> > --- a/drivers/iio/imu/adis16475.c
> > +++ b/drivers/iio/imu/adis16475.c
> > @@ -353,10 +353,11 @@ static int adis16475_set_freq(struct adis16475 *st, const u32 freq)
> > if (dec > st->info->max_dec)
> > dec = st->info->max_dec;
> >
> > - ret = adis_write_reg_16(&st->adis, ADIS16475_REG_DEC_RATE, dec);
> > + ret = __adis_write_reg_16(&st->adis, ADIS16475_REG_DEC_RATE, dec);
> > if (ret)
> > goto error;
> >
> > + adis_dev_unlock(&st->adis);
> > /*
> > * If decimation is used, then gyro and accel data will have meaningful
> > * bits on the LSB registers. This info is used on the trigger handler.
> > --
> > 2.33.0
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-25 14:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-20 9:00 [PATCH] iio: adis16475: fix deadlock on frequency set Nuno Sá
2021-09-20 11:42 ` Alexandru Ardelean
2021-09-25 15:01 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox