From a0f07aae54e87a9fad6d19c0e57398f54d858f06 Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Mon, 13 Dec 2010 15:27:06 -0800 Subject: [PATCH 213/696] PM: Wait for completion of the parent resume before resuming If the parent device is in the DPM_RESUMING state, resume might get called before the parent's resume has completed, because dpm_wait won't get called. This issue was introduced by: 3d46a3c PM: Prevent waiting forever on asynchronous resume after abort Wait for completion of the parent resume if the parent state is >= DPM_OFF or == DPM_RESUMING Signed-off-by: Benoit Goby [dima: fixed to work on 2.6.38, use .in_suspend instead of .state] Signed-off-by: Dima Zavin --- drivers/base/power/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 111a77d..abd3e56 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -512,7 +512,7 @@ static int device_resume(struct device *dev, pm_message_t state, bool async) TRACE_DEVICE(dev); TRACE_RESUME(0); - if (dev->parent && dev->parent->power.status >= DPM_OFF) + if (dev->parent && dev->parent->power.in_suspend) dpm_wait(dev->parent, async); device_lock(dev); -- 1.7.1