mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
Urgent power management fix for v4.14
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). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJZ97EwAAoJEILEb/54YlRxAw8P/Rtl4qgVBGncDCDlmVK7uyaa nFGSSAdgTVo+WlyZ/ubs1zXj8ra8AhkKIOa3rwtFI21e/DejlqTxBbUHQMqSDPZC JUfS6F4hkLW86BmAMeDh+tma0oG5abXvhzx1F26/1LRFsAAORW2MQ02GUzQfe04j iThjk1J+CmfdZ5Lkc6fIWnI5bQRo7WxuYlT1GfthJVPyorTgCviQ/p5I7012HgF1 ZDwCbUWyEereybIMYaXkwXdyP2RltBKDlxRRWe/tC6O3m3VsDHWuO9+HoS6ZFMCH sicgpovEHhZagJSWdNuEK2HAvE3XoDTtWU3xSRkZpxJSarKxPD/aXZzwGkyg1x6N 8/KmuwsBuNThQLY6ODDxBP9+1ThpbpgtFbx8JMPy5/Usdm/HlIJSHZyeGSc6BWoj TI8GLEzqhF61aHWM1u5Nxh8v1DsGvAXEXLWKgQlgfInUPaw1PxYv5lCa5r4fhRzr te3ePtbaMh2bNu0fbJyYgTcteaOz/1DPSc/keYFhhGj/iU39232IzryDZKTbz0Cn Zb0OVhkpQcr+1e3HPf1aTjHVQcWds4QtTmDmaoushxmBxhdBYnWX8qiwwmSnvW8S +kkax7UY4EE7FH+8+3cW7OfqQ7vGLqqG+l3pQptf5yeGMb/hwdWidC669Be6g9Bz tZ0sDywMg2MGcbeRPx/j =xbGZ -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
5f479447d9
1 changed files with 2 additions and 1 deletions
|
@ -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)
|
static inline s32 dev_pm_qos_raw_read_value(struct device *dev)
|
||||||
{
|
{
|
||||||
return IS_ERR_OR_NULL(dev->power.qos) ?
|
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
|
#else
|
||||||
static inline enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev,
|
static inline enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev,
|
||||||
|
|
Loading…
Reference in a new issue