aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/power/hibernate.c')
-rw-r--r--kernel/power/hibernate.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 28db51274ed0..6abdfdf571ee 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -677,7 +677,7 @@ static int load_image_and_restore(void)
677 goto Unlock; 677 goto Unlock;
678 678
679 error = swsusp_read(&flags); 679 error = swsusp_read(&flags);
680 swsusp_close(FMODE_READ); 680 swsusp_close(FMODE_READ | FMODE_EXCL);
681 if (!error) 681 if (!error)
682 hibernation_restore(flags & SF_PLATFORM_MODE); 682 hibernation_restore(flags & SF_PLATFORM_MODE);
683 683
@@ -874,7 +874,7 @@ static int software_resume(void)
874 /* The snapshot device should not be opened while we're running */ 874 /* The snapshot device should not be opened while we're running */
875 if (!atomic_add_unless(&snapshot_device_available, -1, 0)) { 875 if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
876 error = -EBUSY; 876 error = -EBUSY;
877 swsusp_close(FMODE_READ); 877 swsusp_close(FMODE_READ | FMODE_EXCL);
878 goto Unlock; 878 goto Unlock;
879 } 879 }
880 880
@@ -910,7 +910,7 @@ static int software_resume(void)
910 pm_pr_dbg("Hibernation image not present or could not be loaded.\n"); 910 pm_pr_dbg("Hibernation image not present or could not be loaded.\n");
911 return error; 911 return error;
912 Close_Finish: 912 Close_Finish:
913 swsusp_close(FMODE_READ); 913 swsusp_close(FMODE_READ | FMODE_EXCL);
914 goto Finish; 914 goto Finish;
915} 915}
916 916
@@ -1219,7 +1219,7 @@ static int __init resumedelay_setup(char *str)
1219 int rc = kstrtouint(str, 0, &resume_delay); 1219 int rc = kstrtouint(str, 0, &resume_delay);
1220 1220
1221 if (rc) 1221 if (rc)
1222 return rc; 1222 pr_warn("resumedelay: bad option string '%s'\n", str);
1223 return 1; 1223 return 1;
1224} 1224}
1225 1225