From: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/power/swsusp.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

diff -puN kernel/power/swsusp.c~revert-swsusp-fix-breakage-with-swap-on-lvm kernel/power/swsusp.c
--- 25/kernel/power/swsusp.c~revert-swsusp-fix-breakage-with-swap-on-lvm	Thu Feb 16 14:30:02 2006
+++ 25-akpm/kernel/power/swsusp.c	Thu Feb 16 14:32:32 2006
@@ -153,11 +153,13 @@ 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 (!swsusp_resume_device || is_resume_device(swap_info + i)) {
+		if (is_resume_device(swap_info + i)) {
 			spin_unlock(&swap_lock);
 			root_swap = i;
 			return 0;
_