diff options
author | Jiri Slaby <jslaby@suse.cz> | 2011-03-29 17:23:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 19:32:19 -0400 |
commit | 7c31bdb6b2a7118150df1668444fd1b7f1df3b85 (patch) | |
tree | d4560a465b449ffb7b7ca9f9248ccf8fc66b6478 /drivers/tty/moxa.c | |
parent | a664ec9675d77aa2196e797afa5516d3e476da77 (diff) |
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 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) | |||
1129 | struct moxa_port *ch = container_of(port, struct moxa_port, port); | 1129 | struct moxa_port *ch = container_of(port, struct moxa_port, port); |
1130 | MoxaPortDisable(ch); | 1130 | MoxaPortDisable(ch); |
1131 | MoxaPortFlushData(ch, 2); | 1131 | MoxaPortFlushData(ch, 2); |
1132 | clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags); | ||
1133 | } | 1132 | } |
1134 | 1133 | ||
1135 | static int moxa_carrier_raised(struct tty_port *port) | 1134 | static int moxa_carrier_raised(struct tty_port *port) |
@@ -1155,7 +1154,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) | |||
1155 | struct moxa_board_conf *brd; | 1154 | struct moxa_board_conf *brd; |
1156 | struct moxa_port *ch; | 1155 | struct moxa_port *ch; |
1157 | int port; | 1156 | int port; |
1158 | int retval; | ||
1159 | 1157 | ||
1160 | port = tty->index; | 1158 | port = tty->index; |
1161 | if (port == MAX_PORTS) { | 1159 | if (port == MAX_PORTS) { |
@@ -1190,10 +1188,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) | |||
1190 | mutex_unlock(&ch->port.mutex); | 1188 | mutex_unlock(&ch->port.mutex); |
1191 | mutex_unlock(&moxa_openlock); | 1189 | mutex_unlock(&moxa_openlock); |
1192 | 1190 | ||
1193 | retval = tty_port_block_til_ready(&ch->port, tty, filp); | 1191 | return tty_port_block_til_ready(&ch->port, tty, filp); |
1194 | if (retval == 0) | ||
1195 | set_bit(ASYNCB_NORMAL_ACTIVE, &ch->port.flags); | ||
1196 | return retval; | ||
1197 | } | 1192 | } |
1198 | 1193 | ||
1199 | static void moxa_close(struct tty_struct *tty, struct file *filp) | 1194 | static void moxa_close(struct tty_struct *tty, struct file *filp) |