From: Benoit Goby Date: Mon, 13 Dec 2010 23:27:06 +0000 (-0800) Subject: PM: Wait for completion of the parent resume before resuming X-Git-Tag: firefly_0821_release~7613^2~692 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a0f07aae54e87a9fad6d19c0e57398f54d858f06;p=firefly-linux-kernel-4.4.55.git 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 --- diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 111a77dba092..abd3e56b2fa6 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);