Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354779
b: refs/heads/master
c: b9f8033
h: refs/heads/master
i:
  354777: 50d4e7e
  354775: ba32dad
v: v3
  • Loading branch information
Cong Ding authored and Greg Kroah-Hartman committed Jan 16, 2013
1 parent 191862e commit e9d623d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 82f8c35f86a878a504f92559d631ea03f0f62152
refs/heads/master: b9f8033f28448732612e64046b13087b08dd25f7
6 changes: 3 additions & 3 deletions trunk/drivers/tty/pty.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
set_bit(TTY_OTHER_CLOSED, &tty->flags);
#ifdef CONFIG_UNIX98_PTYS
if (tty->driver == ptm_driver) {
mutex_lock(&devpts_mutex);
mutex_lock(&devpts_mutex);
devpts_pty_kill(tty->link->driver_data);
mutex_unlock(&devpts_mutex);
mutex_unlock(&devpts_mutex);
}
#endif
tty_unlock(tty);
Expand Down Expand Up @@ -661,7 +661,7 @@ static const struct tty_operations pty_unix98_ops = {
* Allocate a unix98 pty master device from the ptmx driver.
*
* Locking: tty_mutex protects the init_dev work. tty->count should
* protect the rest.
* protect the rest.
* allocated_ptys_lock handles the list of free pty numbers
*/

Expand Down

0 comments on commit e9d623d

Please sign in to comment.