Skip to content

Commit 5f47944

Browse files
committed
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
2 parents b39ab98 + 2a9a86d commit 5f47944

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

include/linux/pm_qos.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ static inline s32 dev_pm_qos_requested_flags(struct device *dev)
175175
static inline s32 dev_pm_qos_raw_read_value(struct device *dev)
176176
{
177177
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);
179180
}
180181
#else
181182
static inline enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev,

0 commit comments

Comments
 (0)