lkml.org 
[lkml]   [2019]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 07/10] iio: imu: adis: group single conversion under a single state lock
On Thu, 26 Sep 2019 14:18:09 +0300
Alexandru Ardelean <alexandru.ardelean@analog.com> wrote:

> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@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);

\
 
 \ /
  Last update: 2019-10-06 11:20    [W:0.104 / U:0.472 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site