PM: Wait for completion of the parent resume before resuming
authorBenoit Goby <benoit@android.com>
Mon, 13 Dec 2010 23:27:06 +0000 (15:27 -0800)
committerColin Cross <ccross@android.com>
Tue, 14 Jun 2011 16:09:39 +0000 (09:09 -0700)
commita0f07aae54e87a9fad6d19c0e57398f54d858f06
treea498ad9c9bf85b9c409a8da11dcaf97aced6066e
parent1c4f95f81916c95b991019107782a2fa002b30bb
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 <benoit@android.com>
[dima: fixed to work on 2.6.38, use .in_suspend instead of .state]
Signed-off-by: Dima Zavin <dima@android.com>
drivers/base/power/main.c