summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio
diff options
context:
space:
mode:
authorMatheus Tavares <matheus.bernardino@usp.br>2018-11-03 19:49:43 -0300
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2018-11-11 15:29:47 +0000
commit070e8c7da116b81faf0026ecd281e92ad4917a81 (patch)
treef900b6bcd6e299616f1c6611584321abdd302da5 /drivers/staging/iio
parent5ccc612b835b5e1560f913ec96ed6fdc7835892e (diff)
downloadlinux-070e8c7da116b81faf0026ecd281e92ad4917a81.tar.gz
linux-070e8c7da116b81faf0026ecd281e92ad4917a81.tar.bz2
linux-070e8c7da116b81faf0026ecd281e92ad4917a81.zip
staging:iio:ad2s90: Make read_raw return spi_read's error code
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> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/staging/iio')
-rw-r--r--drivers/staging/iio/resolver/ad2s90.c7
1 files 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;