From b165b0d8e62bb65a02d7670d75ebb77a9280bde1 Mon Sep 17 00:00:00 2001 From: Vladimir Senkov Date: Sun, 16 Jun 2013 20:30:52 -0400 Subject: char/serial: fix copy&paste error (fifo8_is_full vs empty) Copy&paste error in serial.c causes a crash when attempting to read from UART (if there is no data to be read) Signed-off-by: Vladimir Senkov Reviewed-by: Peter Crosthwaite Signed-off-by: Michael Tokarev --- hw/char/serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/char') diff --git a/hw/char/serial.c b/hw/char/serial.c index b537e426b0..6382f98389 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -424,7 +424,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr addr, unsigned size) ret = s->divider & 0xff; } else { if(s->fcr & UART_FCR_FE) { - ret = fifo8_is_full(&s->recv_fifo) ? + ret = fifo8_is_empty(&s->recv_fifo) ? 0 : fifo8_pop(&s->recv_fifo); if (s->recv_fifo.num == 0) { s->lsr &= ~(UART_LSR_DR | UART_LSR_BI); -- cgit v1.2.1