aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/disk.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/power/disk.c')
-rw-r--r--kernel/power/disk.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 406b20adb27a..dee0ff40befd 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -58,6 +58,7 @@ static inline int platform_prepare(void)
58 58
59static void power_down(suspend_disk_method_t mode) 59static void power_down(suspend_disk_method_t mode)
60{ 60{
61 disable_nonboot_cpus();
61 switch(mode) { 62 switch(mode) {
62 case PM_DISK_PLATFORM: 63 case PM_DISK_PLATFORM:
63 if (pm_ops && pm_ops->enter) { 64 if (pm_ops && pm_ops->enter) {
@@ -240,12 +241,6 @@ static int software_resume(void)
240 goto Done; 241 goto Done;
241 } 242 }
242 243
243 error = platform_prepare();
244 if (error) {
245 swsusp_free();
246 goto Thaw;
247 }
248
249 pr_debug("PM: Reading swsusp image.\n"); 244 pr_debug("PM: Reading swsusp image.\n");
250 245
251 error = swsusp_read(); 246 error = swsusp_read();
@@ -268,7 +263,6 @@ static int software_resume(void)
268 enable_nonboot_cpus(); 263 enable_nonboot_cpus();
269 Free: 264 Free:
270 swsusp_free(); 265 swsusp_free();
271 platform_finish();
272 device_resume(); 266 device_resume();
273 resume_console(); 267 resume_console();
274 Thaw: 268 Thaw: