| Message ID | 20181103224948.31014-2-matheus.bernardino@usp.br (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging:iio:ad2s90: Add scale info and improve error handling | expand |
On Sat, 3 Nov 2018 19:49:43 -0300 Matheus Tavares <matheus.bernardino@usp.br> wrote: > Previously, when spi_read returned an error code inside ad2s90_read_raw, > the code was ignored and IIO_VAL_INT was returned. This patch makes the > function return the error code returned by spi_read when it fails. > > Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/staging/iio/resolver/ad2s90.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c > index 59586947a936..ba55de29ef36 100644 > --- a/drivers/staging/iio/resolver/ad2s90.c > +++ b/drivers/staging/iio/resolver/ad2s90.c > @@ -36,11 +36,12 @@ static int ad2s90_read_raw(struct iio_dev *indio_dev, > > mutex_lock(&st->lock); > ret = spi_read(st->sdev, st->rx, 2); > - if (ret) > - goto error_ret; > + if (ret < 0) { > + mutex_unlock(&st->lock); > + return ret; > + } > *val = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4); > > -error_ret: > mutex_unlock(&st->lock); > > return IIO_VAL_INT;
diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c index 59586947a936..ba55de29ef36 100644 --- a/drivers/staging/iio/resolver/ad2s90.c +++ b/drivers/staging/iio/resolver/ad2s90.c @@ -36,11 +36,12 @@ static int ad2s90_read_raw(struct iio_dev *indio_dev, mutex_lock(&st->lock); ret = spi_read(st->sdev, st->rx, 2); - if (ret) - goto error_ret; + if (ret < 0) { + mutex_unlock(&st->lock); + return ret; + } *val = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4); -error_ret: mutex_unlock(&st->lock); return IIO_VAL_INT;
Previously, when spi_read returned an error code inside ad2s90_read_raw, the code was ignored and IIO_VAL_INT was returned. This patch makes the function return the error code returned by spi_read when it fails. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> --- drivers/staging/iio/resolver/ad2s90.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)