diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2013-06-15 15:04:51 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-24 03:38:35 +0400 |
| commit | b0e95858238d95f32edf00ff4a0375165129d0c6 (patch) | |
| tree | e07bfa8ce5ce73a360cdd0f5185bf8da9433d48d /drivers/tty/tty_ldisc.c | |
| parent | e97733ca677878d0ecf08af17f4661eb83e268bc (diff) | |
| download | linux-b0e95858238d95f32edf00ff4a0375165129d0c6.tar.xz | |
tty: Clarify multiple-references comment in TIOCSETD ioctl
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_ldisc.c')
| -rw-r--r-- | drivers/tty/tty_ldisc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c index 5819667f5bdb..75fa99978348 100644 --- a/drivers/tty/tty_ldisc.c +++ b/drivers/tty/tty_ldisc.c @@ -570,13 +570,15 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc) tty_ldisc_restore(tty, old_ldisc); } - /* At this point we hold a reference to the new ldisc and a - a reference to the old ldisc. If we ended up flipping back - to the existing ldisc we have two references to it */ - if (tty->ldisc->ops->num != old_ldisc->ops->num && tty->ops->set_ldisc) tty->ops->set_ldisc(tty); + /* At this point we hold a reference to the new ldisc and a + reference to the old ldisc, or we hold two references to + the old ldisc (if it was restored as part of error cleanup + above). In either case, releasing a single reference from + the old ldisc is correct. */ + tty_ldisc_put(old_ldisc); /* |