diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-12-03 23:14:26 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2010-12-24 15:02:42 +0100 |
| commit | d83f905e126f8cbc5e4addc5d1a64aea785b732e (patch) | |
| tree | 45778fff5807b9e844f5290d4f0674433d157102 /drivers/base/power | |
| parent | a2867e08c8e3bdbc00caf56bc3bdde19ccc058e3 (diff) | |
| download | op-kernel-dev-d83f905e126f8cbc5e4addc5d1a64aea785b732e.zip op-kernel-dev-d83f905e126f8cbc5e4addc5d1a64aea785b732e.tar.gz | |
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/power')
| -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 8a52583..fb4ca28 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 "); |
