diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-26 19:44:40 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-26 19:44:40 +0100 |
| commit | 7803516dbe26518115408d53a500ccb4d6a7d1c7 (patch) | |
| tree | e06c2c8708c7f4680a18a0149b2a618eeb19bdaf /kernel/power/hibernate.c | |
| parent | 03c83982a0278207709143ba78c5a470179febee (diff) | |
| parent | 88a5045f176b78c33a269a30a7b146e99c550bd9 (diff) | |
| download | linux-7803516dbe26518115408d53a500ccb4d6a7d1c7.tar.bz2 | |
Merge branch 'pm-sleep'
Merge hibernation-related fixes for 5.16-rc3.
* pm-sleep:
PM: hibernate: Fix snapshot partial write lengths
PM: hibernate: use correct mode for swsusp_close()
Diffstat (limited to 'kernel/power/hibernate.c')
| -rw-r--r-- | kernel/power/hibernate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 9ed9b744876c..e6af502c2fd7 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -693,7 +693,7 @@ static int load_image_and_restore(void) goto Unlock; error = swsusp_read(&flags); - swsusp_close(FMODE_READ); + swsusp_close(FMODE_READ | FMODE_EXCL); if (!error) error = hibernation_restore(flags & SF_PLATFORM_MODE); @@ -983,7 +983,7 @@ static int software_resume(void) /* The snapshot device should not be opened while we're running */ if (!hibernate_acquire()) { error = -EBUSY; - swsusp_close(FMODE_READ); + swsusp_close(FMODE_READ | FMODE_EXCL); goto Unlock; } @@ -1018,7 +1018,7 @@ static int software_resume(void) pm_pr_dbg("Hibernation image not present or could not be loaded.\n"); return error; Close_Finish: - swsusp_close(FMODE_READ); + swsusp_close(FMODE_READ | FMODE_EXCL); goto Finish; } |