Commit 1646a3f2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents d93df29b 5209d1b6

drivers/powercap/dtpm_devfreq.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,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;

	}