Re: [PATCH 07/10] iio: imu: adis: group single conversion under a single state lock

[Jonathan Cameron]

On Thu, 26 Sep 2019 14:18:09 +0300
Alexandru Ardelean <alexandru.ardel...@analog.com> wrote:

> Signed-off-by: Alexandru Ardelean <alexandru.ardel...@analog.com>
Applied.
Thanks,

J
> ---
>  drivers/iio/imu/adis.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/iio/imu/adis.c b/drivers/iio/imu/adis.c
> index 7468294d1776..5e28464ea05b 100644
> --- a/drivers/iio/imu/adis.c
> +++ b/drivers/iio/imu/adis.c
> @@ -404,15 +404,15 @@ int adis_single_conversion(struct iio_dev *indio_dev,
>       unsigned int uval;
>       int ret;
>  
> -     mutex_lock(&indio_dev->mlock);
> +     mutex_lock(&adis->state_lock);
>  
> -     ret = adis_read_reg(adis, chan->address, &uval,
> +     ret = __adis_read_reg(adis, chan->address, &uval,
>                       chan->scan_type.storagebits / 8);
>       if (ret)
>               goto err_unlock;
>  
>       if (uval & error_mask) {
> -             ret = adis_check_status(adis);
> +             ret = __adis_check_status(adis);
>               if (ret)
>                       goto err_unlock;
>       }
> @@ -424,7 +424,7 @@ int adis_single_conversion(struct iio_dev *indio_dev,
>  
>       ret = IIO_VAL_INT;
>  err_unlock:
> -     mutex_unlock(&indio_dev->mlock);
> +     mutex_unlock(&adis->state_lock);
>       return ret;
>  }
>  EXPORT_SYMBOL_GPL(adis_single_conversion);