summaryrefslogtreecommitdiffstats
path: root/drivers/cpuidle
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-08 12:15:50 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-08 12:15:50 +0100
commit4e37fd4d5dfd39f547b0b00fa184a440a1e44b96 (patch)
tree1f2a678cce5422703aa376ab3506f430d51f89da /drivers/cpuidle
parent7943bfaeb6bbbf595df4bd4087f5b890761c4898 (diff)
parent0759e80b84e34a84e7e46e2b1adb528c83d84a47 (diff)
downloadlinux-4e37fd4d5dfd39f547b0b00fa184a440a1e44b96.tar.bz2
Merge branch 'pm-qos' into pm-cpuidle
Diffstat (limited to 'drivers/cpuidle')
-rw-r--r--drivers/cpuidle/governors/menu.c4
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 */