summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-23 02:59:58 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-23 07:38:07 -0800
commit2b322ce210aec74ae0d02938d3a01e29fe079469 (patch)
treea9cb9aa9530cadacae62caf009db506db16eb3c1 /kernel/power
parentbdaff4a331db46f3bd953f413316c4603c4004b4 (diff)
downloadlinux-2b322ce210aec74ae0d02938d3a01e29fe079469.tar.bz2
[PATCH] revert "swsusp: fix breakage with swap on lvm"
This was a temporary thing for 2.6.16. Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/swsusp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 2d9d08f72f76..4e90905f0e87 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -153,11 +153,13 @@ 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 (!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;