commit 88c1ee73d3231c74ff90bcfc084a7589670ec244
author Peter Crosthwaite <peter.crosthwaite@xilinx.com> Mon Feb 10 22:49:35 2014 -0800
committer Michael Tokarev <mjt@tls.msk.ru> Sat Feb 15 16:10:25 2014 +0400
tree 6a070491150953d6f76b46fb726817b47d037af9
parent 5556332aba80c0579244c4458d3e35f13badd5ed

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 <peter.crosthwaite@xilinx.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

hw/char/serial.c

diff --git a/hw/char/serial.c b/hw/char/serial.c
index 27dab7d..6d3b5af 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -225,7 +225,7 @@
 
     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;