Commit 3c3e4b3a authored Mar 08, 2018 by Dan Carpenter Committed by Jonathan Cameron Mar 10, 2018

iio: adc: meson-saradc: unlock on error in meson_sar_adc_lock()



The meson_sar_adc_lock() function is not supposed to hold the
"indio_dev->mlock" on the error path.

Fixes: 3adbf342 ("iio: adc: add a driver for the SAR ADC found in Amlogic Meson SoCs")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

parent 6de2aeb5

drivers/iio/adc/meson_saradc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -462,9 +462,11 @@ 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;
		}