Commit 969e9afd authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[PATCH] sleep: Fix oops in enter_state

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: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 08de1f04
...@@ -167,7 +167,7 @@ static int enter_state(suspend_state_t state) ...@@ -167,7 +167,7 @@ static int enter_state(suspend_state_t state)
{ {
int error; int error;
if (pm_ops->valid && !pm_ops->valid(state)) if (pm_ops && pm_ops->valid && !pm_ops->valid(state))
return -ENODEV; return -ENODEV;
if (down_trylock(&pm_sem)) if (down_trylock(&pm_sem))
return -EBUSY; return -EBUSY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment