提交 969e9afd 编写于 作者: P Pavel Machek 提交者: 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: NPavel Machek <pavel@suse.cz>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册