summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-12-03 23:14:26 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2010-12-24 15:02:42 +0100
commitd83f905e126f8cbc5e4addc5d1a64aea785b732e (patch)
tree45778fff5807b9e844f5290d4f0674433d157102 /drivers/base
parenta2867e08c8e3bdbc00caf56bc3bdde19ccc058e3 (diff)
downloadlinux-d83f905e126f8cbc5e4addc5d1a64aea785b732e.tar.bz2
PM: Use pm_wakeup_pending() in __device_suspend()
Before starting to suspend a device in __device_suspend() check if there's a request to abort the power transition and return -EBUSY in that case. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 8a5258339ca2..fb4ca2870081 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -877,6 +877,11 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
if (async_error)
goto End;
+ if (pm_wakeup_pending()) {
+ async_error = -EBUSY;
+ goto End;
+ }
+
if (dev->class) {
if (dev->class->pm) {
pm_dev_dbg(dev, state, "class ");