From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6612818E37C; Mon, 28 Oct 2024 06:44:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730097844; cv=none; b=G3hcEwU9v2tQO1J2sNduJMtCYBiRI496fK3++I0lzPeyrlLe6Epu5grB87E4XhygJwuoh9hGlMXiXC2MctE4Hnp1pXHguNch1wJzVBJQPf14+D6HTRiCkACVRH5RuYV9srjPKmgEDMZdStJLtTUJhRn5MddqjLWWaxQ5X8v+wAI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730097844; c=relaxed/simple; bh=30AYUa07JSkdioJyu0m1MszhFaxz0SZxjhvwYEonTF4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oBHXtPeApDpEnrgdIxdDgww0f0cYpnYq0tdsK2dNmCrrIM+2it0wPsd+O46j5pjuXaAD+meWPcY/XbTzDVyXO+pX8AKDlNe3XCV5aQCxVueGBfZSlKX9L9np58UACHWsQKAkqwPJUTy4qd9DLBVS6jU90yhCByom9wFmuL9SV7g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GpNyRUs7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GpNyRUs7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0756EC4CEC3; Mon, 28 Oct 2024 06:44:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730097844; bh=30AYUa07JSkdioJyu0m1MszhFaxz0SZxjhvwYEonTF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GpNyRUs7hTONlIRptxVPt12MkpgwicyO/vPEbyRuOBFrO94HPgf17a9m2mis+PucN 7QTMlB1FwTyKTCDC41/j2BS1LhClP0moEGLkOyxWXBBzW7a3IMvetb8A2xCJ8nu7ub AeCxGYUeoVRuo5ZpVZ4m6IxnvhFsWmSWi2fqgwUM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuan Can , Lukasz Luba , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.6 171/208] powercap: dtpm_devfreq: Fix error check against dev_pm_qos_add_request() Date: Mon, 28 Oct 2024 07:25:51 +0100 Message-ID: <20241028062310.842725680@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028062306.649733554@linuxfoundation.org> References: <20241028062306.649733554@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuan Can [ Upstream commit 5209d1b654f1db80509040cc694c7814a1b547e3 ] The caller of the function dev_pm_qos_add_request() checks again a non zero value but dev_pm_qos_add_request() can return '1' if the request already exists. Therefore, the setup function fails while the QoS request actually did not failed. Fix that by changing the check against a negative value like all the other callers of the function. Fixes: e44655617317 ("powercap/drivers/dtpm: Add dtpm devfreq with energy model support") Signed-off-by: Yuan Can Reviewed-by: Lukasz Luba Link: https://patch.msgid.link/20241018021205.46460-1-yuancan@huawei.com [ rjw: Subject edit ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/powercap/dtpm_devfreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/powercap/dtpm_devfreq.c b/drivers/powercap/dtpm_devfreq.c index 612c3b59dd5be..0ca53db7a90eb 100644 --- a/drivers/powercap/dtpm_devfreq.c +++ b/drivers/powercap/dtpm_devfreq.c @@ -166,7 +166,7 @@ static int __dtpm_devfreq_setup(struct devfreq *devfreq, struct dtpm *parent) ret = dev_pm_qos_add_request(dev, &dtpm_devfreq->qos_req, DEV_PM_QOS_MAX_FREQUENCY, PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE); - if (ret) { + if (ret < 0) { pr_err("Failed to add QoS request: %d\n", ret); goto out_dtpm_unregister; } -- 2.43.0