| Message ID | YsbztVuAXnau2cIZ@kili (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: adc: max1027: unlock on error path in max1027_read_single_value() | expand |
On Thu, 7 Jul 2022 17:54:45 +0300 Dan Carpenter <dan.carpenter@oracle.com> wrote: > 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> 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 > --- > 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)
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)
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> --- drivers/iio/adc/max1027.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)