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

Commit db0ef08e authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

amiserial: remove incorrect 'no termios change' check 



Lots of serial drivers check and optimise for setting the termios values to
the ones they were before.  This is pointless and the check is wrong
anyway.  Remove the checks on the serial drivers.  If we ever do need such
a check put it back in the tty layer instead _once_!

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 24da1cbf

drivers/char/amiserial.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -738,6 +738,7 @@ static void change_speed(struct async_struct *info, 
	}

	}

	/* If the quotient is zero refuse the change */

	/* If the quotient is zero refuse the change */

	if (!quot && old_termios) {

	if (!quot && old_termios) {

		/* FIXME: Will need updating for new tty in the end */

		info->tty->termios->c_cflag &= ~CBAUD;

		info->tty->termios->c_cflag &= ~CBAUD;

		info->tty->termios->c_cflag |= (old_termios->c_cflag & CBAUD);

		info->tty->termios->c_cflag |= (old_termios->c_cflag & CBAUD);

		baud = tty_get_baud_rate(info->tty);

		baud = tty_get_baud_rate(info->tty);
@@ -783,7 +784,6 @@ static void change_speed(struct async_struct *info, 
	/*

	/*

	 * Set up parity check flag

	 * Set up parity check flag

	 */

	 */

#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))





	info->read_status_mask = UART_LSR_OE | UART_LSR_DR;

	info->read_status_mask = UART_LSR_OE | UART_LSR_DR;

	if (I_INPCK(info->tty))

	if (I_INPCK(info->tty))
@@ -1367,11 +1367,6 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 
	unsigned long flags;

	unsigned long flags;

	unsigned int cflag = tty->termios->c_cflag;

	unsigned int cflag = tty->termios->c_cflag;





	if (   (cflag == old_termios->c_cflag)

	    && (   RELEVANT_IFLAG(tty->termios->c_iflag) 

		== RELEVANT_IFLAG(old_termios->c_iflag)))

	  return;



	change_speed(info, old_termios);

	change_speed(info, old_termios);





	/* Handle transition to B0 status */

	/* Handle transition to B0 status */