diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2017-06-28 19:34:15 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2017-06-28 19:34:15 +0200 |
| commit | 9a1d168e1bc2893120bb7c0d9932dd22f97d0b55 (patch) | |
| tree | f7d419f1601419aa0aebda102a6b14bdf7653443 /drivers/base/power/main.c | |
| parent | nfsd4: const-ify nfsd4_ops (diff) | |
| parent | Linux 4.12-rc5 (diff) | |
| download | linux-9a1d168e1bc2893120bb7c0d9932dd22f97d0b55.tar.xz linux-9a1d168e1bc2893120bb7c0d9932dd22f97d0b55.zip | |
Merge tag 'v4.12-rc5' into nfsd tree
Update to get f0c3192ceee3 "virtio_net: lower limit on buffer size".
That bug was interfering with my nfsd testing.
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; |