summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-29 21:59:42 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-08-29 21:59:42 +0200
commit70d374ea9907036e15574a5ce89219edd5baee10 (patch)
treeb858bb4a841eb91b1d91b41c33698d05fa7bfb37 /drivers/char
parent[libata sata_nv] NVIDIA ok'd license change from OSL+GPL to GPL (diff)
parent[PATCH] missing include in smc-ultra (diff)
downloadlinux-70d374ea9907036e15574a5ce89219edd5baee10.tar.xz
linux-70d374ea9907036e15574a5ce89219edd5baee10.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/vt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 30d96739fb23..665103ccaee8 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2433,7 +2433,7 @@ static int con_open(struct tty_struct *tty, struct file *filp)
int ret = 0;
acquire_console_sem();
- if (tty->count == 1) {
+ if (tty->driver_data == NULL) {
ret = vc_allocate(currcons);
if (ret == 0) {
struct vc_data *vc = vc_cons[currcons].d;