Merge branch 'pm-qos' into pm-cpuidle

This commit is contained in:
Rafael J. Wysocki
2017-11-08 12:15:50 +01:00
653 changed files with 7265 additions and 4554 deletions
+2 -2
View File
@@ -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 */