From 1c68bcb7e031af45cc3afc5dc471efe6d54800b4 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 13 Oct 2008 10:45:52 +0100 Subject: [PATCH] --- yaml --- r: 113481 b: refs/heads/master c: a90610e50b98e18385d4fbea2c9eaefb12c5a75c h: refs/heads/master i: 113479: f601f9907c55309e3dde2e005f1e8a3be80a2cfb v: v3 --- [refs] | 2 +- trunk/drivers/s390/char/fs3270.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5890f29aaeba..235afeac6429 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 402fda9201ac619ea1f120996b1a142c57aeeb6b +refs/heads/master: a90610e50b98e18385d4fbea2c9eaefb12c5a75c diff --git a/trunk/drivers/s390/char/fs3270.c b/trunk/drivers/s390/char/fs3270.c index 84fbc90480dc..1227f4591f8d 100644 --- a/trunk/drivers/s390/char/fs3270.c +++ b/trunk/drivers/s390/char/fs3270.c @@ -426,18 +426,14 @@ fs3270_open(struct inode *inode, struct file *filp) minor = iminor(filp->f_path.dentry->d_inode); /* Check for minor 0 multiplexer. */ if (minor == 0) { - struct tty_struct *tty; - mutex_lock(&tty_mutex); - tty = get_current_tty(); + struct tty_struct *tty = get_current_tty(); if (!tty || tty->driver->major != IBM_TTY3270_MAJOR) { tty_kref_put(tty); - mutex_unlock(&tty_mutex); rc = -ENODEV; goto out; } minor = tty->index + RAW3270_FIRSTMINOR; tty_kref_put(tty); - mutex_unlock(&tty_mutex); } /* Check if some other program is already using fullscreen mode. */ fp = (struct fs3270 *) raw3270_find_view(&fs3270_fn, minor);