diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/char/tty_io.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/char/tty_io.c')
| -rw-r--r-- | drivers/char/tty_io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index a42c466f7092..6da962c9b21c 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -1423,6 +1423,8 @@ static void release_one_tty(struct work_struct *work) | |||
| 1423 | list_del_init(&tty->tty_files); | 1423 | list_del_init(&tty->tty_files); |
| 1424 | file_list_unlock(); | 1424 | file_list_unlock(); |
| 1425 | 1425 | ||
| 1426 | put_pid(tty->pgrp); | ||
| 1427 | put_pid(tty->session); | ||
| 1426 | free_tty_struct(tty); | 1428 | free_tty_struct(tty); |
| 1427 | } | 1429 | } |
| 1428 | 1430 | ||