Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c31bdb6 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

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: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a664ec96

drivers/tty/moxa.c

+1 −6
Original line number Diff line number Diff line
@@ -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)