From: Andrew Lutomirski Date: Wed, 30 Nov 2016 01:11:51 +0000 (-0800) Subject: PM / QoS: Fix writing 'auto' to pm_qos_latency_tolerance_us X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=80a6f7c79b7822726a096ce9e01cc00a1eacc2c4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git PM / QoS: Fix writing 'auto' to pm_qos_latency_tolerance_us If it was already 'auto', then writing 'auto' again would incorrectly fail. Signed-off-by: Andy Lutomirski Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c index 7f3646e459cb..6a1f2c7e01ea 100644 --- a/drivers/base/power/qos.c +++ b/drivers/base/power/qos.c @@ -856,7 +856,10 @@ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val) struct dev_pm_qos_request *req; if (val < 0) { - ret = -EINVAL; + if (val == PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT) + ret = 0; + else + ret = -EINVAL; goto out; } req = kzalloc(sizeof(*req), GFP_KERNEL);