diff options
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/power/resume.c | 3 | ||||
-rw-r--r-- | drivers/base/power/suspend.c | 2 |
2 files changed, 1 insertions, 4 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 | } |
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c index af2cedfbc1b4..5178b0fbd82e 100644 --- a/drivers/base/power/suspend.c +++ b/drivers/base/power/suspend.c | |||
@@ -71,8 +71,6 @@ int suspend_device(struct device * dev, pm_message_t state) | |||
71 | dev->parent->power.power_state.event); | 71 | dev->parent->power.power_state.event); |
72 | } | 72 | } |
73 | 73 | ||
74 | dev->power.prev_state = dev->power.power_state; | ||
75 | |||
76 | if (dev->class && dev->class->suspend && !dev->power.power_state.event) { | 74 | if (dev->class && dev->class->suspend && !dev->power.power_state.event) { |
77 | suspend_device_dbg(dev, state, "class "); | 75 | suspend_device_dbg(dev, state, "class "); |
78 | error = dev->class->suspend(dev, state); | 76 | error = dev->class->suspend(dev, state); |