diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 03:33:48 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 03:33:48 +0300 |
| commit | 4762573b934cced83b91950f0e7a9f160e3983e3 (patch) | |
| tree | 3ab9a54af2bf2f66776b020eee4f7dbe897912b0 /drivers/cpuidle | |
| parent | 29aaf90875de6a1a760d555f815b18e412b5ab98 (diff) | |
| parent | 0759e80b84e34a84e7e46e2b1adb528c83d84a47 (diff) | |
| download | linux-4762573b934cced83b91950f0e7a9f160e3983e3.tar.xz | |
Merge branch 'pm-qos'
* pm-qos:
PM / QoS: Fix device resume latency framework
PM / QoS: Drop PM_QOS_FLAG_REMOTE_WAKEUP
Diffstat (limited to 'drivers/cpuidle')
| -rw-r--r-- | drivers/cpuidle/governors/menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 48eaf2879228..aa390404e85f 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -298,8 +298,8 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) data->needs_update = 0; } - /* resume_latency is 0 means no restriction */ - if (resume_latency && resume_latency < latency_req) + if (resume_latency < latency_req && + resume_latency != PM_QOS_RESUME_LATENCY_NO_CONSTRAINT) latency_req = resume_latency; /* Special case when user has set very strict latency requirement */ |