aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-04-02 13:54:27 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-09 11:28:26 -0700
commit5f566051fbc3e7754f903b3b4bf67a44e0ae2d1a (patch)
tree5c76188fb417ff77dfb8e093b00acc9e84ca4a37
parent6968a7592a1f27386174617b6dbef31044da91ed (diff)
downloadkernel_goldelico_gta04-5f566051fbc3e7754f903b3b4bf67a44e0ae2d1a.zip
kernel_goldelico_gta04-5f566051fbc3e7754f903b3b4bf67a44e0ae2d1a.tar.gz
kernel_goldelico_gta04-5f566051fbc3e7754f903b3b4bf67a44e0ae2d1a.tar.bz2
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 <jslaby@suse.cz> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/hvc/hvsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
index a7488b7..4006aed 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;