Re: [PATCH] iio: adc: meson-saradc: unlock on error in meson_sar_adc_lock()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, 8 Mar 2018 12:31:53 +0300
Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote:

> The meson_sar_adc_lock() function is not supposed to hold the
> "indio_dev->mlock" on the error path.
> 
> Fixes: 3adbf3427330 ("iio: adc: add a driver for the SAR ADC found in Amlogic Meson SoCs")
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> 
Applied to the fixes-togreg branch of iio.git and marked for stable.

Thanks

Jonathan

> diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
> index 29fa7736d80c..ede955d9b2a4 100644
> --- a/drivers/iio/adc/meson_saradc.c
> +++ b/drivers/iio/adc/meson_saradc.c
> @@ -462,8 +462,10 @@ static int meson_sar_adc_lock(struct iio_dev *indio_dev)
>  			regmap_read(priv->regmap, MESON_SAR_ADC_DELAY, &val);
>  		} while (val & MESON_SAR_ADC_DELAY_BL30_BUSY && timeout--);
>  
> -		if (timeout < 0)
> +		if (timeout < 0) {
> +			mutex_unlock(&indio_dev->mlock);
>  			return -ETIMEDOUT;
> +		}
>  	}
>  
>  	return 0;

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Development]     [Kernel Announce]     [Kernel Newbies]     [Linux Networking Development]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Device Mapper]

  Powered by Linux