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

Commit 768cbfbc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git

parents 2a4a7e02 05ab3014

drivers/serial/21285.c

+2 −12
Original line number Original line Diff line number Diff line
@@ -126,18 +126,8 @@ static irqreturn_t serial21285_rx_chars(int irq, void *dev_id, struct pt_regs *r 
				flag = TTY_FRAME;

				flag = TTY_FRAME;

		}

		}





		if ((rxs & port->ignore_status_mask) == 0) {

		uart_insert_char(port, rxs, RXSTAT_OVERRUN, ch, flag);

			tty_insert_flip_char(tty, ch, flag);



		}

		if ((rxs & RXSTAT_OVERRUN) &&

		    tty->flip.count < TTY_FLIPBUF_SIZE) {

			/*

			 * Overrun is special, since it's reported

			 * immediately, and doesn't affect the current

			 * character.

			 */

			tty_insert_flip_char(tty, 0, TTY_OVERRUN);

		}

		status = *CSR_UARTFLG;

		status = *CSR_UARTFLG;

	}

	}

	tty_flip_buffer_push(tty);

	tty_flip_buffer_push(tty);

drivers/serial/8250.c

+3 −12
Original line number Original line Diff line number Diff line
@@ -1122,18 +1122,9 @@ receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs) 
		}

		}

		if (uart_handle_sysrq_char(&up->port, ch, regs))

		if (uart_handle_sysrq_char(&up->port, ch, regs))

			goto ignore_char;

			goto ignore_char;

		if ((lsr & up->port.ignore_status_mask) == 0) {



			tty_insert_flip_char(tty, ch, flag);

		uart_insert_char(&up->port, lsr, UART_LSR_OE, ch, flag);

		}



		if ((lsr & UART_LSR_OE) &&

		    tty->flip.count < TTY_FLIPBUF_SIZE) {

			/*

			 * Overrun is special, since it's reported

			 * immediately, and doesn't affect the current

			 * character.

			 */

			tty_insert_flip_char(tty, 0, TTY_OVERRUN);

		}

	ignore_char:

	ignore_char:

		lsr = serial_inp(up, UART_LSR);

		lsr = serial_inp(up, UART_LSR);

	} while ((lsr & UART_LSR_DR) && (max_count-- > 0));

	} while ((lsr & UART_LSR_DR) && (max_count-- > 0));

drivers/serial/amba-pl010.c

+2 −12
Original line number Original line Diff line number Diff line
@@ -198,18 +198,8 @@ pl010_rx_chars(struct uart_port *port) 
		if (uart_handle_sysrq_char(port, ch, regs))

		if (uart_handle_sysrq_char(port, ch, regs))

			goto ignore_char;

			goto ignore_char;





		if ((rsr & port->ignore_status_mask) == 0) {

		uart_insert_char(port, rsr, UART01x_RSR_OE, ch, flag);

			tty_insert_flip_char(tty, ch, flag);



		}

		if ((rsr & UART01x_RSR_OE) &&

		    tty->flip.count < TTY_FLIPBUF_SIZE) {

			/*

			 * Overrun is special, since it's reported

			 * immediately, and doesn't affect the current

			 * character

			 */

			tty_insert_flip_char(tty, 0, TTY_OVERRUN);

		}

	ignore_char:

	ignore_char:

		status = UART_GET_FR(port);

		status = UART_GET_FR(port);

	}

	}

drivers/serial/amba-pl011.c

+2 −12
Original line number Original line Diff line number Diff line
@@ -163,18 +163,8 @@ pl011_rx_chars(struct uart_amba_port *uap) 
		if (uart_handle_sysrq_char(&uap->port, ch, regs))

		if (uart_handle_sysrq_char(&uap->port, ch, regs))

			goto ignore_char;

			goto ignore_char;





		if ((rsr & uap->port.ignore_status_mask) == 0) {

		uart_insert_char(&uap->port, rsr, UART01x_RSR_OE, ch, flag);

			tty_insert_flip_char(tty, ch, flag);



		}

		if ((rsr & UART01x_RSR_OE) &&

		    tty->flip.count < TTY_FLIPBUF_SIZE) {

			/*

			 * Overrun is special, since it's reported

			 * immediately, and doesn't affect the current

			 * character

			 */

			tty_insert_flip_char(tty, 0, TTY_OVERRUN);

		}

	ignore_char:

	ignore_char:

		status = readw(uap->port.membase + UART01x_FR);

		status = readw(uap->port.membase + UART01x_FR);

	}

	}

drivers/serial/clps711x.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -143,10 +143,7 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re 
		 * CHECK: does overrun affect the current character?

		 * CHECK: does overrun affect the current character?

		 * ASSUMPTION: it does not.

		 * ASSUMPTION: it does not.

		 */

		 */

		if ((ch & port->ignore_status_mask & ~RXSTAT_OVERRUN) == 0)

		uart_insert_char(port, ch, UARTDR_OVERR, ch, flg);

			tty_insert_flip_char(tty, ch, flg);

		if ((ch & ~port->ignore_status_mask & RXSTAT_OVERRUN) == 0)

			tty_insert_flip_char(tty, 0, TTY_OVERRUN);





	ignore_char:

	ignore_char:

		status = clps_readl(SYSFLG(port));

		status = clps_readl(SYSFLG(port));