Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8534adb authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds
Browse files

[PATCH] swsusp: fix breakage with swap on LVM 



Restore the compatibility with the older code and make it possible to
suspend if the kernel command line doesn't contain the "resume=" argument

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ed3d021b

kernel/power/swsusp.c

+1 −3
Original line number Diff line number Diff line
@@ -153,13 +153,11 @@ static int swsusp_swap_check(void) /* This is called before saving image */ 
{

	int i;



	if (!swsusp_resume_device)

		return -ENODEV;

	spin_lock(&swap_lock);

	for (i = 0; i < MAX_SWAPFILES; i++) {

		if (!(swap_info[i].flags & SWP_WRITEOK))

			continue;

		if (is_resume_device(swap_info + i)) {

		if (!swsusp_resume_device || is_resume_device(swap_info + i)) {

			spin_unlock(&swap_lock);

			root_swap = i;

			return 0;