diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-11-08 21:34:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 07:55:50 -0800 |
| commit | 969e9afd489514252a680914c6d8b9322c713eb4 (patch) | |
| tree | c4a5f7961995961e0305344c2f5759a80c3955ff | |
| parent | 08de1f0461ad40136e7373cf85e2f3c221a9ad9a (diff) | |
| download | op-kernel-dev-969e9afd489514252a680914c6d8b9322c713eb4.zip op-kernel-dev-969e9afd489514252a680914c6d8b9322c713eb4.tar.gz | |
[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: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | kernel/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 18d7d69..6ee2cad 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -167,7 +167,7 @@ static int enter_state(suspend_state_t state) { 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; |
