[PATCH] sleep: Fix oops in enter_state

From: Pavel Machek
Date: Tue Nov 08 2005 - 04:23:07 EST


If ACPI sleep is not configured, but someone still wants to run
swsusp, he'd get oops in enter_state. This is regression since 2.6.14
and this fixes it.

Signed-off-by: Pavel Machek <pavel@xxxxxxx>

diff --git a/kernel/power/main.c b/kernel/power/main.c
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -167,7 +167,7 @@ static int enter_state(suspend_state_t s
{
int error;

- if (pm_ops->valid && !pm_ops->valid(state))
+ if (pm_ops && pm_ops->valid && !pm_ops->valid(state))
return -ENODEV;
if (down_trylock(&pm_sem))
return -EBUSY;

--
Thanks, Sharp!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/