From 2e0fa18a8bbaed6856eb3a3cfc7b49001dbe5474 Mon Sep 17 00:00:00 2001 From: Paul Fulghum Date: Mon, 10 Apr 2006 22:54:19 -0700 Subject: [PATCH] --- yaml --- r: 25518 b: refs/heads/master c: 14a6283eb5c1c70e6deee985c85dcce884150737 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/tty_io.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index adc14e5a8ddd..27a1448c99b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9453a5adaf32aa0b31d1491819a083d403f645c1 +refs/heads/master: 14a6283eb5c1c70e6deee985c85dcce884150737 diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c index b1f9a1582dd7..f70a47eadb52 100644 --- a/trunk/drivers/char/tty_io.c +++ b/trunk/drivers/char/tty_io.c @@ -1740,7 +1740,7 @@ static void release_dev(struct file * filp) { struct tty_struct *tty, *o_tty; int pty_master, tty_closing, o_tty_closing, do_sleep; - int devpts_master, devpts; + int devpts; int idx; char buf[64]; unsigned long flags; @@ -1757,7 +1757,6 @@ static void release_dev(struct file * filp) pty_master = (tty->driver->type == TTY_DRIVER_TYPE_PTY && tty->driver->subtype == PTY_TYPE_MASTER); devpts = (tty->driver->flags & TTY_DRIVER_DEVPTS_MEM) != 0; - devpts_master = pty_master && devpts; o_tty = tty->link; #ifdef TTY_PARANOIA_CHECK