From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756867AbcK3BNU (ORCPT ); Tue, 29 Nov 2016 20:13:20 -0500 Received: from mail.kernel.org ([198.145.29.136]:39976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756704AbcK3BMq (ORCPT ); Tue, 29 Nov 2016 20:12:46 -0500 From: Andy Lutomirski To: "Rafael J. Wysocki" Cc: linux-kernel@vger.kernel.org, Pavel Machek , linux-pm@vger.kernel.org, Andy Lutomirski Subject: [PATCH 2/3] dev_pm_qos: Fix writing 'auto' to pm_qos_latency_tolerance_us Date: Tue, 29 Nov 2016 17:11:51 -0800 Message-Id: X-Mailer: git-send-email 2.9.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If it was already 'auto', then writing 'auto' again would incorrectly fail. Signed-off-by: Andy Lutomirski --- drivers/base/power/qos.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); -- 2.9.3