]> err.no Git - linux-2.6/commit
[PATCH] PowerMac: force only suspend-to-disk to be valid
authorJohannes Berg <johannes@sipsolutions.net>
Fri, 26 May 2006 01:44:24 +0000 (18:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 26 May 2006 18:55:46 +0000 (11:55 -0700)
commit0fba3a1f39f8b0a50b56c8b068fa52131cbc84c2
tree35b5b68cb783305fa783988cbb7042531cb8a316
parent3ac8141366932a74fd8620afaebd66960c91196d
[PATCH] PowerMac: force only suspend-to-disk to be valid

For a very long time, echoing 'standby' or 'mem' into /sys/power/state has
killed the machine on powerpc.  This patch fixes that.

This patch adds the .valid callback to pm_ops on PowerMac so that only the
suspend to disk state can be entered.  Note that just returning 0 would
suffice since the upper layers don't pass PM_SUSPEND_DISK down, but we
handle it there regardless just in case that changes.

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/powerpc/platforms/powermac/setup.c