github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-10 07:32:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "PM: Wait for completion of the parent resume before resuming"

Browse Source 
This reverts commit a0f07aae54.
This commit is contained in:
Colin Cross 2011-06-29 13:42:56 -07:00
parent c797ca58ff
commit a88985f2b5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/power/main.c
View File

@ -515,7 +515,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.in_suspend)
if (dev->parent && dev->parent->power.status >= DPM_OFF)
dpm_wait(dev->parent, async);
device_lock(dev);