diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-19 21:14:35 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-19 21:14:35 +0300 |
| commit | 8052bd8243e823a0954bcbafda8f91072598f13d (patch) | |
| tree | e5f1502735c2a75fbe865cf57582d2e8354e6f43 /drivers/base/power/main.c | |
| parent | d0fabd1cb8b70073a0f44f1cf8b663b5e7241c74 (diff) | |
| parent | 531c221df182af5a7fc2bf7ba7eee89354fe9a10 (diff) | |
| download | linux-8052bd8243e823a0954bcbafda8f91072598f13d.tar.xz | |
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/base/power/main.c')
| -rw-r--r-- | drivers/base/power/main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index e987a6f55d36..9faee1c893e5 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1091,6 +1091,11 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a if (async_error) goto Complete; + if (pm_wakeup_pending()) { + async_error = -EBUSY; + goto Complete; + } + if (dev->power.syscore || dev->power.direct_complete) goto Complete; |