diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 13:22:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 13:22:13 +0100 |
| commit | 4434e5156409eb3ec98f5ad7f0a0c07ebafe970d (patch) | |
| tree | c7f148cdae7a6cf4013253c6c2dbd1c49e837e32 /drivers/base/power/main.c | |
| parent | 2b8f836fb196acede88b6cc772e9057e0a9c0223 (diff) | |
| parent | 694593e3374a67d95ece6a275a1f181644c2c4d8 (diff) | |
Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core
Diffstat (limited to 'drivers/base/power/main.c')
| -rw-r--r-- | drivers/base/power/main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 670c9d6c1407..2d14f4ae6c01 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -333,7 +333,6 @@ static void dpm_power_up(pm_message_t state) */ void device_power_up(pm_message_t state) { - sysdev_resume(); dpm_power_up(state); } EXPORT_SYMBOL_GPL(device_power_up); @@ -577,8 +576,6 @@ int device_power_down(pm_message_t state) } dev->power.status = DPM_OFF_IRQ; } - if (!error) - error = sysdev_suspend(state); if (error) dpm_power_up(resume_event(state)); return error; |