From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Thu, 20 Jul 2017 15:24:21 +0000 (+0900)
Subject: iio: adc: ti-ads1015: don't return invalid value from buffer setup callbacks
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a6fe5e52d5ecfc98530034d6c9db73777cf41ede;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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