From f2fb30d71625ff23b4f7b77c16a18fe8b2f90a45 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 29 Mar 2011 23:23:41 +0200 Subject: [PATCH] --- yaml --- r: 248658 b: refs/heads/master c: 7c31bdb6b2a7118150df1668444fd1b7f1df3b85 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/moxa.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index aff0cb4d11eb..39b100a65689 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a664ec9675d77aa2196e797afa5516d3e476da77 +refs/heads/master: 7c31bdb6b2a7118150df1668444fd1b7f1df3b85 diff --git a/trunk/drivers/tty/moxa.c b/trunk/drivers/tty/moxa.c index ffdaab393144..a290e9ebafe0 100644 --- a/trunk/drivers/tty/moxa.c +++ b/trunk/drivers/tty/moxa.c @@ -1129,7 +1129,6 @@ static void moxa_shutdown(struct tty_port *port) struct moxa_port *ch = container_of(port, struct moxa_port, port); MoxaPortDisable(ch); MoxaPortFlushData(ch, 2); - clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags); } static int moxa_carrier_raised(struct tty_port *port) @@ -1155,7 +1154,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) struct moxa_board_conf *brd; struct moxa_port *ch; int port; - int retval; port = tty->index; if (port == MAX_PORTS) { @@ -1190,10 +1188,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) mutex_unlock(&ch->port.mutex); mutex_unlock(&moxa_openlock); - retval = tty_port_block_til_ready(&ch->port, tty, filp); - if (retval == 0) - set_bit(ASYNCB_NORMAL_ACTIVE, &ch->port.flags); - return retval; + return tty_port_block_til_ready(&ch->port, tty, filp); } static void moxa_close(struct tty_struct *tty, struct file *filp)