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, 0 insertions, 8 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 873cdf8ea5a4..dee0ff40befd 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -241,18 +241,11 @@ static int software_resume(void)
241 goto Done; 241 goto Done;
242 } 242 }
243 243
244 error = platform_prepare();
245 if (error) {
246 swsusp_free();
247 goto Thaw;
248 }
249
250 pr_debug("PM: Reading swsusp image.\n"); 244 pr_debug("PM: Reading swsusp image.\n");
251 245
252 error = swsusp_read(); 246 error = swsusp_read();
253 if (error) { 247 if (error) {
254 swsusp_free(); 248 swsusp_free();
255 platform_finish();
256 goto Thaw; 249 goto Thaw;
257 } 250 }
258 251
@@ -270,7 +263,6 @@ static int software_resume(void)
270 enable_nonboot_cpus(); 263 enable_nonboot_cpus();
271 Free: 264 Free:
272 swsusp_free(); 265 swsusp_free();
273 platform_finish();
274 device_resume(); 266 device_resume();
275 resume_console(); 267 resume_console();
276 Thaw: 268 Thaw: