diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-11-09 06:34:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 16:55:50 +0100 |
| commit | 969e9afd489514252a680914c6d8b9322c713eb4 (patch) | |
| tree | c4a5f7961995961e0305344c2f5759a80c3955ff /kernel | |
| parent | [PATCH] Input: fix 'uniq' reporting in hotplug handler (diff) | |
| download | linux-969e9afd489514252a680914c6d8b9322c713eb4.tar.xz linux-969e9afd489514252a680914c6d8b9322c713eb4.zip | |
[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>
Diffstat (limited to 'kernel')
| -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 18d7d693fbba..6ee2cad530e8 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; |