lkml.org 
[lkml]   [2021]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 074/151] iio: adis16475: fix deadlock on frequency set
    Date
    From: Nuno Sá <nuno.sa@analog.com>

    commit 9da1b86865ab4376408c58cd9fec332c8bdb5c73 upstream.

    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>
    Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com>
    Link: https://lore.kernel.org/r/20210920090047.74903-1-nuno.sa@analog.com
    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/iio/imu/adis16475.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/iio/imu/adis16475.c
    +++ b/drivers/iio/imu/adis16475.c
    @@ -353,10 +353,11 @@ static int adis16475_set_freq(struct adi
    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.

    \
     
     \ /
      Last update: 2021-10-18 16:00    [W:4.355 / U:0.836 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site