aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/power/resume.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-06-17 13:48:06 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-07-11 19:09:02 -0400
commit515c53576299e32d6bdb6295cfa2fe1307516eb4 (patch)
tree210def9ddfced2800dc014a49a6f6a37dbf795eb /drivers/base/power/resume.c
parent2a0134554e12f530c6eccb1dab3f0f8954f855c9 (diff)
PM: Remove prev_state from struct dev_pm_info
The prev_state member of struct dev_pm_info (defined in include/linux/pm.h) is only used during a resume to check if the device's state before the suspend was 'off', in which case the device is not resumed. However, in such cases the decision whether or not to resume the device should be made on the driver level and the resume callbacks from the device's bus and class should be executed anyway (the may be needed for some things other than just powering on the device). Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/power/resume.c')
-rw-r--r--drivers/base/power/resume.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 99679e7a6cc6..0c9610688542 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -88,8 +88,7 @@ void dpm_resume(void)
88 list_move_tail(entry, &dpm_active); 88 list_move_tail(entry, &dpm_active);
89 89
90 mutex_unlock(&dpm_list_mtx); 90 mutex_unlock(&dpm_list_mtx);
91 if (!dev->power.prev_state.event) 91 resume_device(dev);
92 resume_device(dev);
93 mutex_lock(&dpm_list_mtx); 92 mutex_lock(&dpm_list_mtx);
94 put_device(dev); 93 put_device(dev);
95 } 94 }