diff options
Diffstat (limited to 'kernel/power/hibernate.c')
| -rw-r--r-- | kernel/power/hibernate.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 04b3a83d686f..04a9e90d248f 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c | |||
| @@ -693,21 +693,22 @@ static int software_resume(void) | |||
| 693 | /* The snapshot device should not be opened while we're running */ | 693 | /* The snapshot device should not be opened while we're running */ |
| 694 | if (!atomic_add_unless(&snapshot_device_available, -1, 0)) { | 694 | if (!atomic_add_unless(&snapshot_device_available, -1, 0)) { |
| 695 | error = -EBUSY; | 695 | error = -EBUSY; |
| 696 | swsusp_close(FMODE_READ); | ||
| 696 | goto Unlock; | 697 | goto Unlock; |
| 697 | } | 698 | } |
| 698 | 699 | ||
| 699 | pm_prepare_console(); | 700 | pm_prepare_console(); |
| 700 | error = pm_notifier_call_chain(PM_RESTORE_PREPARE); | 701 | error = pm_notifier_call_chain(PM_RESTORE_PREPARE); |
| 701 | if (error) | 702 | if (error) |
| 702 | goto Finish; | 703 | goto close_finish; |
| 703 | 704 | ||
| 704 | error = usermodehelper_disable(); | 705 | error = usermodehelper_disable(); |
| 705 | if (error) | 706 | if (error) |
| 706 | goto Finish; | 707 | goto close_finish; |
| 707 | 708 | ||
| 708 | error = create_basic_memory_bitmaps(); | 709 | error = create_basic_memory_bitmaps(); |
| 709 | if (error) | 710 | if (error) |
| 710 | goto Finish; | 711 | goto close_finish; |
| 711 | 712 | ||
| 712 | pr_debug("PM: Preparing processes for restore.\n"); | 713 | pr_debug("PM: Preparing processes for restore.\n"); |
| 713 | error = prepare_processes(); | 714 | error = prepare_processes(); |
| @@ -719,6 +720,7 @@ static int software_resume(void) | |||
| 719 | pr_debug("PM: Reading hibernation image.\n"); | 720 | pr_debug("PM: Reading hibernation image.\n"); |
| 720 | 721 | ||
| 721 | error = swsusp_read(&flags); | 722 | error = swsusp_read(&flags); |
| 723 | swsusp_close(FMODE_READ); | ||
| 722 | if (!error) | 724 | if (!error) |
| 723 | hibernation_restore(flags & SF_PLATFORM_MODE); | 725 | hibernation_restore(flags & SF_PLATFORM_MODE); |
| 724 | 726 | ||
| @@ -737,6 +739,9 @@ static int software_resume(void) | |||
| 737 | mutex_unlock(&pm_mutex); | 739 | mutex_unlock(&pm_mutex); |
| 738 | pr_debug("PM: Resume from disk failed.\n"); | 740 | pr_debug("PM: Resume from disk failed.\n"); |
| 739 | return error; | 741 | return error; |
| 742 | close_finish: | ||
| 743 | swsusp_close(FMODE_READ); | ||
| 744 | goto Finish; | ||
| 740 | } | 745 | } |
| 741 | 746 | ||
| 742 | late_initcall(software_resume); | 747 | late_initcall(software_resume); |
