commit b7a3b1cde2127f70d9fc24b7c99fbbc3899afab5
author Anthony Liguori <aliguori@us.ibm.com> Mon Jun 17 08:57:07 2013 -0500
committer Anthony Liguori <aliguori@us.ibm.com> Mon Jun 17 08:57:07 2013 -0500
tree 43b5b2ddf4eb32a0c25ba4ccaab9d81e9eea057d
parent 030b4b7debf659dcd6fc66826564285fdce5057d
parent b165b0d8e62bb65a02d7670d75ebb77a9280bde1

Merge remote-tracking branch 'mjt/trivial-patches' into staging

# By Michael Tokarev (1) and Vladimir Senkov (1)
# Via Michael Tokarev
* mjt/trivial-patches:
  char/serial: fix copy&paste error (fifo8_is_full vs empty)
  vl: always define no_frame

Message-id: 1371455050-9523-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

hw/char/serial.c

diff --git a/hw/char/serial.c b/hw/char/serial.c
index b537e42..6382f98 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -424,7 +424,7 @@
             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);