Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 969e9afd489514252a680914c6d8b9322c713eb4

Authored by Pavel Machek
Committed by Linus Torvalds
1 parent 08de1f0461
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -167,7 +167,7 @@
167 167 {
168 168 int error;
169 169  
170   - if (pm_ops->valid && !pm_ops->valid(state))
  170 + if (pm_ops && pm_ops->valid && !pm_ops->valid(state))
171 171 return -ENODEV;
172 172 if (down_trylock(&pm_sem))
173 173 return -EBUSY;