diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-11-02 12:40:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-11-02 12:40:41 +1000 |
| commit | 7a88cbd8d65d622c00bd76ba4ae1d893b292c91c (patch) | |
| tree | 826df7ac42ca13c33828d0142046186b91df686b /drivers/base/power/runtime.c | |
| parent | 0a4334c9e5405f836c46375c6e279cfdda7da6b5 (diff) | |
| parent | 0b07194bb55ed836c2cc7c22e866b87a14681984 (diff) | |
Backmerge tag 'v4.14-rc7' into drm-next
Linux 4.14-rc7
Requested by Ben Skeggs for nouveau to avoid major conflicts,
and things were getting a bit conflicty already, esp around amdgpu
reverts.
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; |