diff options
Diffstat (limited to 'kernel/power/hibernate.c')
-rw-r--r-- | kernel/power/hibernate.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 196c01268ebd..ba2319ffc860 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c | |||
@@ -607,17 +607,6 @@ static void power_down(void) | |||
607 | while(1); | 607 | while(1); |
608 | } | 608 | } |
609 | 609 | ||
610 | static int prepare_processes(void) | ||
611 | { | ||
612 | int error = 0; | ||
613 | |||
614 | if (freeze_processes()) { | ||
615 | error = -EBUSY; | ||
616 | thaw_processes(); | ||
617 | } | ||
618 | return error; | ||
619 | } | ||
620 | |||
621 | /** | 610 | /** |
622 | * hibernate - Carry out system hibernation, including saving the image. | 611 | * hibernate - Carry out system hibernation, including saving the image. |
623 | */ | 612 | */ |
@@ -650,7 +639,7 @@ int hibernate(void) | |||
650 | sys_sync(); | 639 | sys_sync(); |
651 | printk("done.\n"); | 640 | printk("done.\n"); |
652 | 641 | ||
653 | error = prepare_processes(); | 642 | error = freeze_processes(); |
654 | if (error) | 643 | if (error) |
655 | goto Finish; | 644 | goto Finish; |
656 | 645 | ||
@@ -811,7 +800,7 @@ static int software_resume(void) | |||
811 | goto close_finish; | 800 | goto close_finish; |
812 | 801 | ||
813 | pr_debug("PM: Preparing processes for restore.\n"); | 802 | pr_debug("PM: Preparing processes for restore.\n"); |
814 | error = prepare_processes(); | 803 | error = freeze_processes(); |
815 | if (error) { | 804 | if (error) { |
816 | swsusp_close(FMODE_READ); | 805 | swsusp_close(FMODE_READ); |
817 | goto Done; | 806 | goto Done; |