[PATCH] swsusp: add check for suspension of X-controlled devices

It is unsafe to suspend devices if the hardware is controlled by X.  Add an
extra check to prevent this from happening.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 12 insertions, 1 deletions

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 8660779fb288..bdb60663f2ef 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -8,6 +8,7 @@
  *
  */
 
+#include <linux/vt_kern.h>
 #include <linux/device.h>
 #include "../base.h"
 #include "power.h"
@@ -62,7 +63,6 @@ int suspend_device(struct device * dev, pm_message_t state)
         return error;
 }
 
-
 /**
  *      device_suspend - Save state and stop all devices in system.
  *      @state:         Power state to put each device in.
@@ -82,6 +82,9 @@ int device_suspend(pm_message_t state)
 {
         int error = 0;
 
+        if (!is_console_suspend_safe())
+                return -EINVAL;
+
         down(&dpm_sem);
         down(&dpm_list_sem);
         while (!list_empty(&dpm_active) && error == 0) {
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 0900d1dbee59..86b31b87eb85 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -3234,6 +3234,14 @@ void vcs_scr_writew(struct vc_data *vc, u16 val, u16 *org)
         }
 }
 
+int is_console_suspend_safe(void)
+{
+        /* It is unsafe to suspend devices while X has control of the
+         * hardware. Make sure we are running on a kernel-controlled console.
+         */
+        return vc_cons[fg_console].d->vc_mode == KD_TEXT;
+}
+
 /*
  *      Visible symbols for modules
  */