[ARM] 3402/1: lpd7a40x: serial driver bug fix (fb62c5a7) · Commits · 戴 / test

drivers/serial/serial_lh7a40x.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -145,14 +145,15 @@ lh7a40xuart_rx_chars (struct uart_port* port)
		{
		struct tty_struct* tty = port->info->tty;
		int cbRxMax = 256; /* (Gross) limit on receive */
		unsigned int data, flag;/* Received data and status */
		unsigned int data; /* Received data and status */
		unsigned int flag;

		while (!(UR (port, UART_R_STATUS) & nRxRdy) && --cbRxMax) {
		data = UR (port, UART_R_DATA);
		flag = TTY_NORMAL;
		++port->icount.rx;

		if (unlikely(data & RxError)) { /* Quick check, short-circuit */
		if (unlikely(data & RxError)) {
		if (data & RxBreak) {
		data &= ~(RxFramingError \| RxParityError);
		++port->icount.brk;
		@@ -662,10 +663,14 @@ static int __init lh7a40xuart_init(void)
		if (ret == 0) {
		int i;

		for (i = 0; i < DEV_NR; i++)
		for (i = 0; i < DEV_NR; i++) {
		/* UART3, when used, requires GPIO pin reallocation */
		if (lh7a40x_ports[i].port.mapbase == UART3_PHYS)
		GPIO_PINMUX \|= 1<<3;
		uart_add_one_port (&lh7a40x_reg,
		&lh7a40x_ports[i].port);
		}
		}
		return ret;
		}