From e32c14667e4fe9f16ac9b918d15d29abd2315a55 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 29 Jun 2011 13:43:12 -0700 Subject: [PATCH 331/696] Revert "PM: Prevent waiting forever on asynchronous resume after abort" This reverts commit fa92a3d6959546baa27e892188d3e9bb79c31741. --- drivers/base/power/main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 8984e13..06e4391 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -515,8 +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.status >= DPM_OFF) - dpm_wait(dev->parent, async); + dpm_wait(dev->parent, async); device_lock(dev); dev->power.in_suspend = false; -- 1.7.1