Skip to content

Commit 1646a3f

Browse files
committed
Merge branch 'pm-powercap'
Merge a dtpm_devfreq power capping driver fix for 6.12-rc5: - Fix a dev_pm_qos_add_request() return value check in __dtpm_devfreq_setup() to prevent it from failing if a positive number is returned (Yuan Can). * pm-powercap: powercap: dtpm_devfreq: Fix error check against dev_pm_qos_add_request()
2 parents d93df29 + 5209d1b commit 1646a3f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/powercap/dtpm_devfreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static int __dtpm_devfreq_setup(struct devfreq *devfreq, struct dtpm *parent)
178178
ret = dev_pm_qos_add_request(dev, &dtpm_devfreq->qos_req,
179179
DEV_PM_QOS_MAX_FREQUENCY,
180180
PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE);
181-
if (ret) {
181+
if (ret < 0) {
182182
pr_err("Failed to add QoS request: %d\n", ret);
183183
goto out_dtpm_unregister;
184184
}

0 commit comments

Comments
 (0)