[PATCH 1/1] swsusp: fix breakage with swap on LVM

From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Andrew Morton <akpm@osdl.org>
Cc: Pavel Machek <pavel@suse.cz>, Dave Jones <davej@redhat.com>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/1] swsusp: fix breakage with swap on LVM
Date: Thu, 16 Feb 2006 16:03:48 +0100	[thread overview]
Message-ID: <200602161603.49329.rjw@sisk.pl> (raw)
In-Reply-To: <200602161558.57702.rjw@sisk.pl>

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: Rafael J. Wysocki <rjw@sisk.pl>
---
 kernel/power/swsusp.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

Index: linux-2.6.16-rc3/kernel/power/swsusp.c
===================================================================

--- linux-2.6.16-rc3.orig/kernel/power/swsusp.c
+++ linux-2.6.16-rc3/kernel/power/swsusp.c
@@ -153,13 +153,11 @@ static int swsusp_swap_check(void) /* Th
 {
 	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;

