[PATCH] introduce .valid callback for pm_ops

[karo-tx-linux.git] / kernel / power / main.c

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 71aa0fd22007d8c5c188a4ce62c516726fd228d2..18d7d693fbba852c48acc40de4ad8809baf5d36e 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -143,11 +143,12 @@ static void suspend_finish(suspend_state_t state)
 
 
 
-static char * pm_states[] = {
+static char *pm_states[PM_SUSPEND_MAX] = {
        [PM_SUSPEND_STANDBY]    = "standby",
        [PM_SUSPEND_MEM]        = "mem",
+#ifdef CONFIG_SOFTWARE_SUSPEND
        [PM_SUSPEND_DISK]       = "disk",
-       NULL,
+#endif
 };
 
 
@@ -166,6 +167,8 @@ static int enter_state(suspend_state_t state)
 {
        int error;
 
+       if (pm_ops->valid && !pm_ops->valid(state))
+               return -ENODEV;
        if (down_trylock(&pm_sem))
                return -EBUSY;
 
@@ -235,7 +238,8 @@ static ssize_t state_show(struct subsystem * subsys, char * buf)
        char * s = buf;
 
        for (i = 0; i < PM_SUSPEND_MAX; i++) {
-               if (pm_states[i])
+               if (pm_states[i] && pm_ops && (!pm_ops->valid
+                       ||(pm_ops->valid && pm_ops->valid(i))))
                        s += sprintf(s,"%s ",pm_states[i]);
        }
        s += sprintf(s,"\n");