diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-10-25 17:27:19 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-10-25 17:27:19 +0200 |
| commit | 1646a3f2b1bda03a763f7aecf83504144fb8bba9 (patch) | |
| tree | 0c2b72b826357fdf10162e2d39daa3ff7070fa98 | |
| parent | cpufreq: CPPC: fix perf_to_khz/khz_to_perf conversion exception (diff) | |
| parent | powercap: dtpm_devfreq: Fix error check against dev_pm_qos_add_request() (diff) | |
| download | linux-1646a3f2b1bda03a763f7aecf83504144fb8bba9.tar.xz linux-1646a3f2b1bda03a763f7aecf83504144fb8bba9.zip | |
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()
| -rw-r--r-- | drivers/powercap/dtpm_devfreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/powercap/dtpm_devfreq.c b/drivers/powercap/dtpm_devfreq.c index f40bce8176df..d1dff6ccab12 100644 --- a/drivers/powercap/dtpm_devfreq.c +++ b/drivers/powercap/dtpm_devfreq.c @@ -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; } |