From: Jiri Slaby Date: Mon, 2 Apr 2012 11:54:27 +0000 (+0200) Subject: TTY: hvsi, CLOCAL is not in tty->flags X-Git-Tag: next-20120411~17^2~36 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5f566051fbc3e7754f903b3b4bf67a44e0ae2d1a;p=karo-tx-linux.git TTY: hvsi, CLOCAL is not in tty->flags 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 Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c index a7488b748647..4006aed42ee2 100644 --- a/drivers/tty/hvc/hvsi.c +++ b/drivers/tty/hvc/hvsi.c @@ -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;