[PATCH v2 02/19] iio: adc: at91-sama5d2_adc: check return status for pressure and touch

[Jonathan Cameron]

On Tue, 28 Jun 2022 18:16:14 +0300
Claudiu Beznea <claudiu.beznea at microchip.com> wrote:

> Check return status of at91_adc_read_position() and
> at91_adc_read_pressure() in at91_adc_read_info_raw().
> 
> Fixes: 6794e23fa3fe ("iio: adc: at91-sama5d2_adc: add support for oversampling resolution")
> Signed-off-by: Claudiu Beznea <claudiu.beznea at microchip.com>
> ---
>  drivers/iio/adc/at91-sama5d2_adc.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
> index 32b6f157b803..c3301c749164 100644
> --- a/drivers/iio/adc/at91-sama5d2_adc.c
> +++ b/drivers/iio/adc/at91-sama5d2_adc.c
> @@ -1544,8 +1544,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);
Prefer to keep error path out of line.

		if (ret < 0)
			return ret;

		return at91_adc_adjust_val_osr();

Also ends up as a slightly less invasive change.

> +		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);
> @@ -1558,8 +1560,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);
As above.

> +		return ret;
>  	}
>  
>  	/* in this case we have a voltage channel */