Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7c31bdb6b2a7118150df1668444fd1b7f1df3b85

Authored by Jiri Slaby
Committed by Greg Kroah-Hartman
1 parent a664ec9675
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 1 changed file with 1 additions and 6 deletions Side-by-side Diff

... ... @@ -1129,7 +1129,6 @@
1129 1129 struct moxa_port *ch = container_of(port, struct moxa_port, port);
1130 1130 MoxaPortDisable(ch);
1131 1131 MoxaPortFlushData(ch, 2);
1132   - clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
1133 1132 }
1134 1133  
1135 1134 static int moxa_carrier_raised(struct tty_port *port)
... ... @@ -1155,7 +1154,6 @@
1155 1154 struct moxa_board_conf *brd;
1156 1155 struct moxa_port *ch;
1157 1156 int port;
1158   - int retval;
1159 1157  
1160 1158 port = tty->index;
1161 1159 if (port == MAX_PORTS) {
... ... @@ -1190,10 +1188,7 @@
1190 1188 mutex_unlock(&ch->port.mutex);
1191 1189 mutex_unlock(&moxa_openlock);
1192 1190  
1193   - retval = 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;
  1191 + return tty_port_block_til_ready(&ch->port, tty, filp);
1197 1192 }
1198 1193  
1199 1194 static void moxa_close(struct tty_struct *tty, struct file *filp)