Merge tag 'pm-urgent-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

torvalds · torvalds · commit 5f479447d983 · 2017-10-30T16:38:03.000-07:00
Pull power management fix from Rafael Wysocki:
 "This fixes new breakage introduced by the most recent PM QoS fix in
  which, embarrassingly enough, I forgot to update
  dev_pm_qos_raw_read_value() to return the right default for devices
  with no PM QoS constraints at all which prevents runtime PM from
  suspending those devices (fix from Tero Kristo)"

* tag 'pm-urgent-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / QoS: Fix default runtime_pm device resume latency
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
@@ -175,7 +175,8 @@ static inline s32 dev_pm_qos_requested_flags(struct device *dev)
 static inline s32 dev_pm_qos_raw_read_value(struct device *dev)
 {
 	return IS_ERR_OR_NULL(dev->power.qos) ?
-		0 : pm_qos_read_value(&dev->power.qos->resume_latency);
+		PM_QOS_RESUME_LATENCY_NO_CONSTRAINT :
+		pm_qos_read_value(&dev->power.qos->resume_latency);
 }
 #else
 static inline enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev,

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,8 @@ static inline s32 dev_pm_qos_requested_flags(struct device *dev)`
`175`	`175`	`static inline s32 dev_pm_qos_raw_read_value(struct device *dev)`
`176`	`176`	`{`
`177`	`177`	`return IS_ERR_OR_NULL(dev->power.qos) ?`
`178`		`- 0 : pm_qos_read_value(&dev->power.qos->resume_latency);`
	`178`	`+ PM_QOS_RESUME_LATENCY_NO_CONSTRAINT :`
	`179`	`+ pm_qos_read_value(&dev->power.qos->resume_latency);`
`179`	`180`	`}`
`180`	`181`	`#else`
`181`	`182`	`static inline enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev,`