summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2009-07-08 13:26:05 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2009-07-08 13:26:05 +0200
commit886a7a3371da8ee46a13f8e598a536bd8765b837 (patch)
tree5b6b9fb297cc3f59cd1777548e2fa82d4e1bb5f9 /drivers/base
parent00024be9689963c55cf2ab10ce3fb4502016c09a (diff)
downloadop-kernel-dev-886a7a3371da8ee46a13f8e598a536bd8765b837.zip
op-kernel-dev-886a7a3371da8ee46a13f8e598a536bd8765b837.tar.gz
PM: Clear -EAGAIN in dpm_prepare
When the last device in the dpm list is unregistered directly after its prepare() callback returned with -EAGAIN, the return code is passed to the calling function, resulting in a suspend failure. Prevent this by clearing the return code after -EAGAIN. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index fae7254..58a3e57 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -762,6 +762,7 @@ static int dpm_prepare(pm_message_t state)
dev->power.status = DPM_ON;
if (error == -EAGAIN) {
put_device(dev);
+ error = 0;
continue;
}
printk(KERN_ERR "PM: Failed to prepare device %s "
OpenPOWER on IntegriCloud