lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 0778/1095] iio: adc: max1027: unlock on error path in max1027_read_single_value()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 06ee60eb507f00fb3643876ec05318c63332dc88 ]

    If max1027_wait_eoc() fails then call iio_device_release_direct_mode()
    before returning.

    Fixes: a0e831653ef9 ("iio: adc: max1027: Introduce an end of conversion helper")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Link: https://lore.kernel.org/r/YsbztVuAXnau2cIZ@kili
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iio/adc/max1027.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c
    index b725d012625c..136fcf753837 100644
    --- a/drivers/iio/adc/max1027.c
    +++ b/drivers/iio/adc/max1027.c
    @@ -349,8 +349,7 @@ static int max1027_read_single_value(struct iio_dev *indio_dev,
    if (ret < 0) {
    dev_err(&indio_dev->dev,
    "Failed to configure conversion register\n");
    - iio_device_release_direct_mode(indio_dev);
    - return ret;
    + goto release;
    }

    /*
    @@ -360,11 +359,12 @@ static int max1027_read_single_value(struct iio_dev *indio_dev,
    */
    ret = max1027_wait_eoc(indio_dev);
    if (ret)
    - return ret;
    + goto release;

    /* Read result */
    ret = spi_read(st->spi, st->buffer, (chan->type == IIO_TEMP) ? 4 : 2);

    +release:
    iio_device_release_direct_mode(indio_dev);

    if (ret < 0)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 00:20    [W:4.020 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site