iio: adc: max1027: unlock on error path in max1027_read_single_value()
Subsystems (2)
PATCH 1/1 iio: adc: max1027: unlock on error path in max1027_read_single_value()
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 <[email protected]>
--- drivers/iio/adc/max1027.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/adc/max1027.c +3 -3
@@ -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 )
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerQuoted 5 lines · On Thu, 7 Jul 2022 17:54:45 +0300 Dan Carpenter <[email protected]>…
If
max1027_wait_eoc()fails then calliio_device_release_direct_mode()before returning.Fixes a0e831653ef9 ("iio: adc: max1027: Introduce an end of conversion helper")Signed-off-by Dan Carpenter <[email protected]>
Queued up on a special
fixes-togreg-post-5.20-rc1 branch in iio.git as I don't think I'll get another pull request out for this in time to intercept the merge window.
Thanks,
Jonathan
Quoted 32 lines
--- drivers/iio/adc/max1027.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/iio/adc/max1027.c +3
-3@@ -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 )