* [PATCH] iio: adc: max1027: unlock on error path in max1027_read_single_value()
@ 2022-07-07 14:54 Dan Carpenter
2022-07-16 17:54 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2022-07-07 14:54 UTC (permalink / raw)
To: Jonathan Cameron, Miquel Raynal
Cc: Lars-Peter Clausen, Nuno Sá, linux-iio, kernel-janitors
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] iio: adc: max1027: unlock on error path in max1027_read_single_value()
2022-07-07 14:54 [PATCH] iio: adc: max1027: unlock on error path in max1027_read_single_value() Dan Carpenter
@ 2022-07-16 17:54 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2022-07-16 17:54 UTC (permalink / raw)
To: Dan Carpenter
Cc: Miquel Raynal, Lars-Peter Clausen, Nuno Sá, linux-iio,
kernel-janitors
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-16 17:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-07 14:54 [PATCH] iio: adc: max1027: unlock on error path in max1027_read_single_value() Dan Carpenter
2022-07-16 17:54 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox