---

yaml --- r: 98383 b: refs/heads/master c: 96a331b h: refs/heads/master i: 98381: 3f6a6a0 98379: 7e9a728 98375: 0bf632d 98367: 02581e5 v: v3
git-mirror · Jun 23, 2008 · 826bc78 · 826bc78
1 parent 2e2b009
commit 826bc78
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36c7343b4ecac2432430f5393314f1bdc2c219a5
+refs/heads/master: 96a331b1d6426726c37242ddbe939ee14b255790
diff --git a/trunk/drivers/char/tty_ioctl.c b/trunk/drivers/char/tty_ioctl.c
@@ -981,16 +981,9 @@ EXPORT_SYMBOL_GPL(tty_perform_flush);
 int n_tty_ioctl(struct tty_struct *tty, struct file *file,
 		       unsigned int cmd, unsigned long arg)
 {
-	struct tty_struct *real_tty;
 	unsigned long flags;
 	int retval;
 
-	if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
-	    tty->driver->subtype == PTY_TYPE_MASTER)
-		real_tty = tty->link;
-	else
-		real_tty = tty;
-
 	switch (cmd) {
 	case TCXONC:
 		retval = tty_check_change(tty);