TTY: hvsi, CLOCAL is not in tty->flags
authorJiri Slaby <jslaby@suse.cz>
Mon, 2 Apr 2012 11:54:27 +0000 (13:54 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Apr 2012 18:28:26 +0000 (11:28 -0700)
It is in termios cflags. So change the test in hvsi_recv_control to do
the right thing. Previously it was actually testing TTY_LDISC_OPEN
bit, i.e. whether an ldisc is active. And yes, it is most of the time.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/hvc/hvsi.c

index a7488b7486473c8139d8baae1874ac86bf7979ae..4006aed42ee29eb6ae789c8432b59d1d65c1ad88 100644 (file)
@@ -248,7 +248,7 @@ static void hvsi_recv_control(struct hvsi_struct *hp, uint8_t *packet,
                                pr_debug("hvsi%i: CD dropped\n", hp->index);
                                hp->mctrl &= TIOCM_CD;
                                /* If userland hasn't done an open(2) yet, hp->tty is NULL. */
-                               if (hp->tty && !(hp->tty->flags & CLOCAL))
+                               if (hp->tty && !C_CLOCAL(hp->tty))
                                        *to_hangup = hp->tty;
                        }
                        break;