diff options
| author | Andrew Johnson <ajohnson@intrinsyc.com> | 2007-03-16 17:38:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-16 22:25:05 -0400 |
| commit | b257bc051f06607beb3004d9a1c297085e728bec (patch) | |
| tree | 2eeb60429d92b683e9593d2fcde2f22ae40a1bf4 /drivers/char/vt_ioctl.c | |
| parent | 1174cf730179d8f029b9e93cb9a4d5bfb08d1202 (diff) | |
[PATCH] swsusp: fix suspend when console is in VT_AUTO+KD_GRAPHICS mode
When the console is in VT_AUTO+KD_GRAPHICS mode, switching to the
SUSPEND_CONSOLE fails, resulting in vt_waitactive() waiting indefinitely or
until the task is interrupted. This patch tests if a console switch can
occur in set_console() and returns early if a console switch is not
possible.
[akpm@linux-foundation.org: cleanup]
Signed-off-by: Andrew Johnson <ajohnson@intrinsyc.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/vt_ioctl.c')
| -rw-r--r-- | drivers/char/vt_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index 3a5d301e783b..1fa2da8f4fbe 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #include <linux/kbd_diacr.h> | 34 | #include <linux/kbd_diacr.h> |
| 35 | #include <linux/selection.h> | 35 | #include <linux/selection.h> |
| 36 | 36 | ||
| 37 | static char vt_dont_switch; | 37 | char vt_dont_switch; |
| 38 | extern struct tty_driver *console_driver; | 38 | extern struct tty_driver *console_driver; |
| 39 | 39 | ||
| 40 | #define VT_IS_IN_USE(i) (console_driver->ttys[i] && console_driver->ttys[i]->count) | 40 | #define VT_IS_IN_USE(i) (console_driver->ttys[i] && console_driver->ttys[i]->count) |