diff options
Diffstat (limited to 'kernel/power/hibernate.c')
-rw-r--r-- | kernel/power/hibernate.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 6c9c9dc48c75..657272e91d0a 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c | |||
@@ -708,7 +708,7 @@ static int software_resume(void) | |||
708 | goto Unlock; | 708 | goto Unlock; |
709 | } | 709 | } |
710 | 710 | ||
711 | pr_debug("PM: Checking image partition %s\n", resume_file); | 711 | pr_debug("PM: Checking hibernation image partition %s\n", resume_file); |
712 | 712 | ||
713 | /* Check if the device is there */ | 713 | /* Check if the device is there */ |
714 | swsusp_resume_device = name_to_dev_t(resume_file); | 714 | swsusp_resume_device = name_to_dev_t(resume_file); |
@@ -733,10 +733,10 @@ static int software_resume(void) | |||
733 | } | 733 | } |
734 | 734 | ||
735 | Check_image: | 735 | Check_image: |
736 | pr_debug("PM: Resume from partition %d:%d\n", | 736 | pr_debug("PM: Hibernation image partition %d:%d present\n", |
737 | MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device)); | 737 | MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device)); |
738 | 738 | ||
739 | pr_debug("PM: Checking hibernation image.\n"); | 739 | pr_debug("PM: Looking for hibernation image.\n"); |
740 | error = swsusp_check(); | 740 | error = swsusp_check(); |
741 | if (error) | 741 | if (error) |
742 | goto Unlock; | 742 | goto Unlock; |
@@ -768,14 +768,14 @@ static int software_resume(void) | |||
768 | goto Done; | 768 | goto Done; |
769 | } | 769 | } |
770 | 770 | ||
771 | pr_debug("PM: Reading hibernation image.\n"); | 771 | pr_debug("PM: Loading hibernation image.\n"); |
772 | 772 | ||
773 | error = swsusp_read(&flags); | 773 | error = swsusp_read(&flags); |
774 | swsusp_close(FMODE_READ); | 774 | swsusp_close(FMODE_READ); |
775 | if (!error) | 775 | if (!error) |
776 | hibernation_restore(flags & SF_PLATFORM_MODE); | 776 | hibernation_restore(flags & SF_PLATFORM_MODE); |
777 | 777 | ||
778 | printk(KERN_ERR "PM: Restore failed, recovering.\n"); | 778 | printk(KERN_ERR "PM: Failed to load hibernation image, recovering.\n"); |
779 | swsusp_free(); | 779 | swsusp_free(); |
780 | thaw_processes(); | 780 | thaw_processes(); |
781 | Done: | 781 | Done: |
@@ -788,7 +788,7 @@ static int software_resume(void) | |||
788 | /* For success case, the suspend path will release the lock */ | 788 | /* For success case, the suspend path will release the lock */ |
789 | Unlock: | 789 | Unlock: |
790 | mutex_unlock(&pm_mutex); | 790 | mutex_unlock(&pm_mutex); |
791 | pr_debug("PM: Resume from disk failed.\n"); | 791 | pr_debug("PM: Hibernation image not present or could not be loaded.\n"); |
792 | return error; | 792 | return error; |
793 | close_finish: | 793 | close_finish: |
794 | swsusp_close(FMODE_READ); | 794 | swsusp_close(FMODE_READ); |