| Message ID | 20211004134454.GA11689@kili (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: adc: max1027: fix error code in max1027_wait_eoc() | expand |
Hello, dan.carpenter@oracle.com wrote on Mon, 4 Oct 2021 16:44:54 +0300: > Return -ETIMEDOUT on timeout instead of success. > > Fixes: 54f14be01e17 ("iio: adc: max1027: Use the EOC IRQ when populated for single reads") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/iio/adc/max1027.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c > index 45dc8a625fa3..4daf1d576c4e 100644 > --- a/drivers/iio/adc/max1027.c > +++ b/drivers/iio/adc/max1027.c > @@ -286,7 +286,7 @@ static int max1027_wait_eoc(struct iio_dev *indio_dev) > msecs_to_jiffies(1000)); > reinit_completion(&st->complete); > if (!ret) > - return ret; > + return -ETIMEDOUT; Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> > } else { > if (indio_dev->active_scan_mask) > conversion_time *= hweight32(*indio_dev->active_scan_mask); Thanks, Miquèl
On Mon, 4 Oct 2021 16:17:11 +0200 Miquel Raynal <miquel.raynal@bootlin.com> wrote: > Hello, > > dan.carpenter@oracle.com wrote on Mon, 4 Oct 2021 16:44:54 +0300: > > > Return -ETIMEDOUT on timeout instead of success. > > > > Fixes: 54f14be01e17 ("iio: adc: max1027: Use the EOC IRQ when populated for single reads") > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > --- > > drivers/iio/adc/max1027.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c > > index 45dc8a625fa3..4daf1d576c4e 100644 > > --- a/drivers/iio/adc/max1027.c > > +++ b/drivers/iio/adc/max1027.c > > @@ -286,7 +286,7 @@ static int max1027_wait_eoc(struct iio_dev *indio_dev) > > msecs_to_jiffies(1000)); > > reinit_completion(&st->complete); > > if (!ret) > > - return ret; > > + return -ETIMEDOUT; > > Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Applied to the togreg branch of iio.git. As this is the only patch I've applied today I've just pushed it out directly for next to pick up rather than going through the normal initial push to testing for 0-day. Thanks, Jonathan > > > } else { > > if (indio_dev->active_scan_mask) > > conversion_time *= hweight32(*indio_dev->active_scan_mask); > > > Thanks, > Miquèl
diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c index 45dc8a625fa3..4daf1d576c4e 100644 --- a/drivers/iio/adc/max1027.c +++ b/drivers/iio/adc/max1027.c @@ -286,7 +286,7 @@ static int max1027_wait_eoc(struct iio_dev *indio_dev) msecs_to_jiffies(1000)); reinit_completion(&st->complete); if (!ret) - return ret; + return -ETIMEDOUT; } else { if (indio_dev->active_scan_mask) conversion_time *= hweight32(*indio_dev->active_scan_mask);
Return -ETIMEDOUT on timeout instead of success. Fixes: 54f14be01e17 ("iio: adc: max1027: Use the EOC IRQ when populated for single reads") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/iio/adc/max1027.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)