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

Commit 46778752 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Greg Kroah-Hartman
Browse files

iio: adc: at91-sama5d2_adc: check return status for pressure and touch 



[ Upstream commit d84ace944a3b24529798dbae1340dea098473155 ]

Check return status of at91_adc_read_position() and
at91_adc_read_pressure() in at91_adc_read_info_raw().

Fixes: 6794e23f ("iio: adc: at91-sama5d2_adc: add support for oversampling resolution")
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220803102855.2191070-3-claudiu.beznea@microchip.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d50e3817

drivers/iio/adc/at91-sama5d2_adc.c

+6 −2
Original line number Diff line number Diff line
@@ -1323,8 +1323,10 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev, 
		*val = tmp_val;

		mutex_unlock(&st->lock);

		iio_device_release_direct_mode(indio_dev);

		if (ret > 0)

			ret = at91_adc_adjust_val_osr(st, val);



		return at91_adc_adjust_val_osr(st, val);

		return ret;

	}

	if (chan->type == IIO_PRESSURE) {

		ret = iio_device_claim_direct_mode(indio_dev);
@@ -1337,8 +1339,10 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev, 
		*val = tmp_val;

		mutex_unlock(&st->lock);

		iio_device_release_direct_mode(indio_dev);

		if (ret > 0)

			ret = at91_adc_adjust_val_osr(st, val);



		return at91_adc_adjust_val_osr(st, val);

		return ret;

	}



	/* in this case we have a voltage channel */