diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
| commit | d6f818f71fa5db79969aaecba302745199376169 (patch) | |
| tree | fcdedce488db0f80c7a816e0b52df83a01972838 /kernel/power/main.c | |
| parent | ace14b82633960a2b6bf6a0b2640c63872a65562 (diff) | |
| parent | 305b07680f6c6a7e59f996c5bd85f009caff5bb1 (diff) | |
| download | talos-op-linux-d6f818f71fa5db79969aaecba302745199376169.tar.gz talos-op-linux-d6f818f71fa5db79969aaecba302745199376169.zip | |
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index b4d219016b6c..c9632f841f64 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -298,8 +298,12 @@ static int suspend_enter(suspend_state_t state) goto Done; } - if (!suspend_test(TEST_CORE)) - error = suspend_ops->enter(state); + error = sysdev_suspend(PMSG_SUSPEND); + if (!error) { + if (!suspend_test(TEST_CORE)) + error = suspend_ops->enter(state); + sysdev_resume(); + } device_power_up(PMSG_RESUME); Done: |
