1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index ffdaab393144..a290e9ebafe0 100644
--- a/drivers/tty/moxa.c
+++ b/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)