diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2009-08-11 23:20:41 +0200 |
|---|---|---|
| committer | Live-CD User <linux@linux.site> | 2009-09-19 22:13:35 +0200 |
| commit | 797938b5e33991dadf4dd9228b932cc69c3e905a (patch) | |
| tree | 09f46aa97bdda15af24b6197d6fbb058eb85e75c /drivers/char | |
| parent | tty: vt: use printk_once (diff) | |
| download | linux-797938b5e33991dadf4dd9228b932cc69c3e905a.tar.xz linux-797938b5e33991dadf4dd9228b932cc69c3e905a.zip | |
tty: Power: fix suspend vt regression
vt_waitactive no longer accepts console parameter as console-1
since commit "vt: add an event interface". It expects console
number directly (as viewed by userspace -- counting from 1).
Fix a deadlock suspend regression by redefining adding one
to vt in vt_move_to_console.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char')
| -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 30b5d128037c..29c651ab0d78 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c @@ -1757,7 +1757,7 @@ int vt_move_to_console(unsigned int vt, int alloc) return -EIO; } release_console_sem(); - if (vt_waitactive(vt)) { + if (vt_waitactive(vt + 1)) { pr_debug("Suspend: Can't switch VCs."); return -EINTR; } |