Commit 7803516d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents 03c83982 88a5045f

kernel/power/hibernate.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}

kernel/power/user.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static ssize_t snapshot_write(struct file *filp, const char __user *buf, 
		if (res <= 0)

			goto unlock;

	} else {

		res = PAGE_SIZE - pg_offp;

		res = PAGE_SIZE;

	}



	if (!data_of(data->handle)) {