diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2011-03-29 23:23:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 16:32:19 -0700 |
| commit | 7c31bdb6b2a7118150df1668444fd1b7f1df3b85 (patch) | |
| tree | d4560a465b449ffb7b7ca9f9248ccf8fc66b6478 /drivers/tty/moxa.c | |
| parent | a664ec9675d77aa2196e797afa5516d3e476da77 (diff) | |
| download | linux-3.10-7c31bdb6b2a7118150df1668444fd1b7f1df3b85.tar.gz linux-3.10-7c31bdb6b2a7118150df1668444fd1b7f1df3b85.tar.bz2 linux-3.10-7c31bdb6b2a7118150df1668444fd1b7f1df3b85.zip | |
Char: moxa, do not touch NORMAL_ACTIVE bit
The bit is set in tty_port_block_til_ready (via moxa_open) and unset
in tty_port_close (via moxa_close). No need to pin it in the driver.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/moxa.c')
| -rw-r--r-- | drivers/tty/moxa.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c index ffdaab39314..a290e9ebafe 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) |