diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-08-16 14:24:51 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-08-16 14:24:51 +0200 |
| commit | a3ee2477c45f73184a64d9c6cf97855a52732dc6 (patch) | |
| tree | 5944233e282bd02b583045cc1617cdaf7d02a9bb /drivers | |
| parent | nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled (diff) | |
| parent | cpufreq: schedutil: Don't skip freq update when limits change (diff) | |
| download | linux-dev-a3ee2477c45f73184a64d9c6cf97855a52732dc6.tar.xz linux-dev-a3ee2477c45f73184a64d9c6cf97855a52732dc6.zip | |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq: schedutil: Don't skip freq update when limits change
cpufreq: dev_pm_qos_update_request() can return 1 on success
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 8dda62367816..c28ebf2810f1 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -2528,7 +2528,7 @@ static int cpufreq_boost_set_sw(int state) } ret = dev_pm_qos_update_request(policy->max_freq_req, policy->max); - if (ret) + if (ret < 0) break; } |