diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-08 12:15:50 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-08 12:15:50 +0100 |
| commit | 4e37fd4d5dfd39f547b0b00fa184a440a1e44b96 (patch) | |
| tree | 1f2a678cce5422703aa376ab3506f430d51f89da /drivers/base/power/runtime.c | |
| parent | ARM: cpuidle: Refactor rollback operations if init fails (diff) | |
| parent | PM / QoS: Fix device resume latency framework (diff) | |
| download | linux-4e37fd4d5dfd39f547b0b00fa184a440a1e44b96.tar.xz linux-4e37fd4d5dfd39f547b0b00fa184a440a1e44b96.zip | |
Merge branch 'pm-qos' into pm-cpuidle
Diffstat (limited to 'drivers/base/power/runtime.c')
| -rw-r--r-- | drivers/base/power/runtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 7bcf80fa9ada..13e015905543 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -253,7 +253,7 @@ static int rpm_check_suspend_allowed(struct device *dev) || (dev->power.request_pending && dev->power.request == RPM_REQ_RESUME)) retval = -EAGAIN; - else if (__dev_pm_qos_read_value(dev) < 0) + else if (__dev_pm_qos_read_value(dev) == 0) retval = -EPERM; else if (dev->power.runtime_status == RPM_SUSPENDED) retval = 1; |