From e9d623d9b156968fb59965b697adf7205877a6bf Mon Sep 17 00:00:00 2001 From: Cong Ding Date: Sat, 12 Jan 2013 05:01:22 +0100 Subject: [PATCH] --- yaml --- r: 354779 b: refs/heads/master c: b9f8033f28448732612e64046b13087b08dd25f7 h: refs/heads/master i: 354777: 50d4e7ea50731e34db9e3e8ed49e0163e20af601 354775: ba32dadee0310e0834d357968a56595d7ab2e5ce v: v3 --- [refs] | 2 +- trunk/drivers/tty/pty.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ccafdaf11a90..e00a12cc93b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82f8c35f86a878a504f92559d631ea03f0f62152 +refs/heads/master: b9f8033f28448732612e64046b13087b08dd25f7 diff --git a/trunk/drivers/tty/pty.c b/trunk/drivers/tty/pty.c index 916825f984a9..4ec11f326d6d 100644 --- a/trunk/drivers/tty/pty.c +++ b/trunk/drivers/tty/pty.c @@ -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); @@ -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 */