I just noticed that when I was cleaning up the pm_ops implementations I accidentally removed the standby mode from pnx4008 by not marking it valid. This patch adds it back and also removes some useless related code. Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> --- arch/arm/mach-pnx4008/pm.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- wireless-dev.orig/arch/arm/mach-pnx4008/pm.c 2007-04-26 17:25:56.793249310 +0200 +++ wireless-dev/arch/arm/mach-pnx4008/pm.c 2007-04-26 17:26:45.503249310 +0200 @@ -107,17 +107,19 @@ static int pnx4008_pm_enter(suspend_stat case PM_SUSPEND_MEM: pnx4008_suspend(); break; - case PM_SUSPEND_DISK: - return -ENOTSUPP; - default: - return -EINVAL; } return 0; } +static int pnx4008_pm_valid(suspend_state_t state) +{ + return (state == PM_SUSPEND_STANDBY) || + (state == PM_SUSPEND_MEM); +} + static struct pm_ops pnx4008_pm_ops = { .enter = pnx4008_pm_enter, - .valid = pm_valid_only_mem, + .valid = pnx4008_pm_valid, }; static int __init pnx4008_pm_init(void) _______________________________________________ linux-pm mailing list linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/linux-pm