summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2017-07-21 00:24:21 +0900
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2017-08-20 15:41:14 +0100
commita6fe5e52d5ecfc98530034d6c9db73777cf41ede (patch)
tree184aac4328e6f7e210f4b2a459ecad116677f9be /drivers/iio
parent73e3e3fc50de50cfd68e945d85679c983ed31bd9 (diff)
downloadtalos-obmc-linux-a6fe5e52d5ecfc98530034d6c9db73777cf41ede.tar.gz
talos-obmc-linux-a6fe5e52d5ecfc98530034d6c9db73777cf41ede.zip
iio: adc: ti-ads1015: don't return invalid value from buffer setup callbacks
pm_runtime_get_sync() and pm_runtime_put_autosuspend() return 0 on success, 1 if the device's runtime PM status was already requested status or error code on failure. So a positive return value doesn't indicate an error condition. However, any non-zero return values from buffer preenable and postdisable callbacks are recognized as an error and this driver reuses the return value from pm_runtime_get_sync() and pm_runtime_put_autosuspend() in these callbacks. This change fixes the false error detections. Cc: Daniel Baluta <daniel.baluta@gmail.com> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/adc/ti-ads1015.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
index 2f52b149f49a..d48515682dee 100644
--- a/drivers/iio/adc/ti-ads1015.c
+++ b/drivers/iio/adc/ti-ads1015.c
@@ -235,7 +235,7 @@ static int ads1015_set_power_state(struct ads1015_data *data, bool on)
ret = pm_runtime_put_autosuspend(dev);
}
- return ret;
+ return ret < 0 ? ret : 0;
}
static
OpenPOWER on IntegriCloud