]> git.hungrycats.org Git - linux/commitdiff
powercap: dtpm_devfreq: Fix error check against dev_pm_qos_add_request()
authorYuan Can <yuancan@huawei.com>
Fri, 18 Oct 2024 02:12:05 +0000 (10:12 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Nov 2024 00:56:05 +0000 (01:56 +0100)
[ 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 <yuancan@huawei.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Link: https://patch.msgid.link/20241018021205.46460-1-yuancan@huawei.com
[ rjw: Subject edit ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/powercap/dtpm_devfreq.c

index 612c3b59dd5bef6409be8ff95803d38f39e2c90d..0ca53db7a90eb370b73a5ac2c5ab369b5d2493d7 100644 (file)
@@ -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;
        }