diff options
| author | Linus Torvalds | 2017-10-31 00:38:03 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-10-31 00:38:03 +0100 |
| commit | 5f479447d983111c039f1d6d958553c1ad1b2ff1 (patch) | |
| tree | 083c30786b6bdec21913e34cc39fca8a54caa22c | |
| parent | Mark 'ioremap_page_range()' as possibly sleeping (diff) | |
| parent | PM / QoS: Fix default runtime_pm device resume latency (diff) | |
| download | kernel-qcow2-linux-5f479447d983111c039f1d6d958553c1ad1b2ff1.tar.gz kernel-qcow2-linux-5f479447d983111c039f1d6d958553c1ad1b2ff1.tar.xz kernel-qcow2-linux-5f479447d983111c039f1d6d958553c1ad1b2ff1.zip | |
Merge tag 'pm-urgent-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
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
| -rw-r--r-- | include/linux/pm_qos.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 6737a8c9e8c6..d68b0569a5eb 100644 --- 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, |