From 88c1ee73d3231c74ff90bcfc084a7589670ec244 Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Mon, 10 Feb 2014 22:49:35 -0800 Subject: char/serial: Fix emptyness check This was guarding against a full fifo rather than an empty fifo when popping. Fix. Signed-off-by: Peter Crosthwaite Reviewed-by: Martin Kletzander Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Michael Tokarev --- hw/char/serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/char/serial.c') diff --git a/hw/char/serial.c b/hw/char/serial.c index 27dab7d9d6..6d3b5aff8b 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -225,7 +225,7 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) if (s->tsr_retry <= 0) { if (s->fcr & UART_FCR_FE) { - s->tsr = fifo8_is_full(&s->xmit_fifo) ? + s->tsr = fifo8_is_empty(&s->xmit_fifo) ? 0 : fifo8_pop(&s->xmit_fifo); if (!s->xmit_fifo.num) { s->lsr |= UART_LSR_THRE; -- cgit v1.2.3