lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 458/862] iio: adc: at91-sama5d2_adc: check return status for pressure and touch
    Date
    From: Claudiu Beznea <claudiu.beznea@microchip.com>

    [ Upstream commit d84ace944a3b24529798dbae1340dea098473155 ]

    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@microchip.com>
    Link: https://lore.kernel.org/r/20220803102855.2191070-3-claudiu.beznea@microchip.com
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 ac9ef89fba17..08d1f806c839 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);
    + 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);
    + return ret;
    }

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


    \
     
     \ /
      Last update: 2022-10-19 12:48    [W:4.028 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site