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

Commit 5131bf5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents 358c6ac0 ff39bc77

drivers/serial/sa1100.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void 
sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs)

{

	struct tty_struct *tty = sport->port.info->tty;

	unsigned int status, ch, flg, ignored = 0;

	unsigned int status, ch, flg;



	status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |

		 UTSR0_TO_SM(UART_GET_UTSR0(sport));