summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2011-02-11 15:39:28 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 11:27:17 -0800
commitd637837583163a1a70331ce48097f697cac85e32 (patch)
tree5d1bdb86349cecd7cd1c102a55eb5218f870e271
parent42bd7a4f68e7785dce656a379c3de0a74f5a4d84 (diff)
downloadlinux-d637837583163a1a70331ce48097f697cac85e32.tar.bz2
tty,vt: fix VT_SETACTIVATE console switch
using VT_SETACTIVATE ioctl for console switch did not work, since it put wrong param to the set_console function. Also ioctl returned misleading error, because of the missing break statement. I wonder anyone has ever used this one :). Signed-off-by: Jiri Olsa <jolsa@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/tty/vt/vt_ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 6bcf05bf4978..9e9a901442a3 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -1010,8 +1010,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
if (ret)
break;
/* Commence switch and lock */
- set_console(arg);
+ set_console(vsa.console);
}
+ break;
}
/*