Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f479447 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b39ab98e 2a9a86d5

include/linux/pm_qos.h

+2 −1
Original line number Diff line number Diff line
@@ -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,