Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f896155 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

Staging: iio: add some unlocks to raw_read() functions 



This code was cut and pasted in several places.  It's missing some
unlocks on error.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c060ae7d

drivers/staging/iio/accel/adis16203_core.c

+6 −2
Original line number Diff line number Diff line
@@ -311,14 +311,18 @@ static int adis16203_read_raw(struct iio_dev *indio_dev, 
		mutex_lock(&indio_dev->mlock);

		addr = adis16203_addresses[chan->address][0];

		ret = adis16203_spi_read_reg_16(indio_dev, addr, &val16);

		if (ret)

		if (ret) {

			mutex_unlock(&indio_dev->mlock);

			return ret;

		}



		if (val16 & ADIS16203_ERROR_ACTIVE) {

			ret = adis16203_check_status(indio_dev);

			if (ret)

			if (ret) {

				mutex_unlock(&indio_dev->mlock);

				return ret;

			}

		}

		val16 = val16 & ((1 << chan->scan_type.realbits) - 1);

		if (chan->scan_type.sign == 's')

			val16 = (s16)(val16 <<

drivers/staging/iio/accel/adis16204_core.c

+6 −2
Original line number Diff line number Diff line
@@ -341,14 +341,18 @@ static int adis16204_read_raw(struct iio_dev *indio_dev, 
		mutex_lock(&indio_dev->mlock);

		addr = adis16204_addresses[chan->address][0];

		ret = adis16204_spi_read_reg_16(indio_dev, addr, &val16);

		if (ret)

		if (ret) {

			mutex_unlock(&indio_dev->mlock);

			return ret;

		}



		if (val16 & ADIS16204_ERROR_ACTIVE) {

			ret = adis16204_check_status(indio_dev);

			if (ret)

			if (ret) {

				mutex_unlock(&indio_dev->mlock);

				return ret;

			}

		}

		val16 = val16 & ((1 << chan->scan_type.realbits) - 1);

		if (chan->scan_type.sign == 's')

			val16 = (s16)(val16 <<

drivers/staging/iio/accel/adis16209_core.c

+6 −2
Original line number Diff line number Diff line
@@ -337,14 +337,18 @@ static int adis16209_read_raw(struct iio_dev *indio_dev, 
		mutex_lock(&indio_dev->mlock);

		addr = adis16209_addresses[chan->address][0];

		ret = adis16209_spi_read_reg_16(indio_dev, addr, &val16);

		if (ret)

		if (ret) {

			mutex_unlock(&indio_dev->mlock);

			return ret;

		}



		if (val16 & ADIS16209_ERROR_ACTIVE) {

			ret = adis16209_check_status(indio_dev);

			if (ret)

			if (ret) {

				mutex_unlock(&indio_dev->mlock);

				return ret;

			}

		}

		val16 = val16 & ((1 << chan->scan_type.realbits) - 1);

		if (chan->scan_type.sign == 's')

			val16 = (s16)(val16 <<

drivers/staging/iio/accel/adis16240_core.c

+6 −2
Original line number Diff line number Diff line
@@ -370,14 +370,18 @@ static int adis16240_read_raw(struct iio_dev *indio_dev, 
		mutex_lock(&indio_dev->mlock);

		addr = adis16240_addresses[chan->address][0];

		ret = adis16240_spi_read_reg_16(indio_dev, addr, &val16);

		if (ret)

		if (ret) {

			mutex_unlock(&indio_dev->mlock);

			return ret;

		}



		if (val16 & ADIS16240_ERROR_ACTIVE) {

			ret = adis16240_check_status(indio_dev);

			if (ret)

			if (ret) {

				mutex_unlock(&indio_dev->mlock);

				return ret;

			}

		}

		val16 = val16 & ((1 << chan->scan_type.realbits) - 1);

		if (chan->scan_type.sign == 's')

			val16 = (s16)(val16 <<

drivers/staging/iio/gyro/adis16260_core.c

+6 −2
Original line number Diff line number Diff line
@@ -446,14 +446,18 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, 
		mutex_lock(&indio_dev->mlock);

		addr = adis16260_addresses[chan->address][0];

		ret = adis16260_spi_read_reg_16(indio_dev, addr, &val16);

		if (ret)

		if (ret) {

			mutex_unlock(&indio_dev->mlock);

			return ret;

		}



		if (val16 & ADIS16260_ERROR_ACTIVE) {

			ret = adis16260_check_status(indio_dev);

			if (ret)

			if (ret) {

				mutex_unlock(&indio_dev->mlock);

				return ret;

			}

		}

		val16 = val16 & ((1 << chan->scan_type.realbits) - 1);

		if (chan->scan_type.sign == 's')

			val16 = (s16)(val16 <<