Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 289273
b: refs/heads/master
c: a50f724
h: refs/heads/master
i:
  289271: d95af0b
v: v3
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Feb 2, 2012
1 parent 04c1329 commit d6b1565
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 81f5835eae424be646753ec5a044ed4db1fcc09a
refs/heads/master: a50f724a432997321cabb6c9e665c28e34850f78
5 changes: 1 addition & 4 deletions trunk/drivers/tty/pty.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,7 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
wake_up_interruptible(&tty->link->write_wait);
if (tty->driver->subtype == PTY_TYPE_MASTER) {
set_bit(TTY_OTHER_CLOSED, &tty->flags);
#ifdef CONFIG_UNIX98_PTYS
if (tty->driver == ptm_driver)
devpts_pty_kill(tty->link);
#endif
devpts_pty_kill(tty->link);
tty_unlock();
tty_vhangup(tty->link);
tty_lock();
Expand Down

0 comments on commit d6b1565

Please sign in to comment.