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

Commit 2e55b57a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents f50c0283 f9937242

drivers/serial/clps711x.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re 
{

	struct uart_port *port = dev_id;

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

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

	unsigned int status, ch, flg;



	status = clps_readl(SYSFLG(port));

	while (!(status & SYSFLG_URXFE)) {