[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 10/10] char/serial: Fix emptyness check
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 10/10] char/serial: Fix emptyness check |
Date: |
Sat, 15 Feb 2014 16:18:20 +0400 |
From: Peter Crosthwaite <address@hidden>
This was guarding against a full fifo rather than an empty fifo when
popping. Fix.
Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Martin Kletzander <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/char/serial.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 @@ 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;
--
1.7.10.4
- [Qemu-trivial] [PULL 00/10] Trivial patches for 2014-02-15, Michael Tokarev, 2014/02/15
- [Qemu-trivial] [PULL 01/10] misc: Fix case Qemu -> QEMU, Michael Tokarev, 2014/02/15
- [Qemu-trivial] [PULL 07/10] vl: remove old, long-unused defines, Michael Tokarev, 2014/02/15
- [Qemu-trivial] [PULL 06/10] net: declare struct iovec in checksum.h to fix compiler warning, Michael Tokarev, 2014/02/15
- [Qemu-trivial] [PULL 10/10] char/serial: Fix emptyness check,
Michael Tokarev <=
- [Qemu-trivial] [PULL 09/10] gitignore: anchor all ignored names, Michael Tokarev, 2014/02/15
- [Qemu-trivial] [PULL 08/10] vl: trim includes, Michael Tokarev, 2014/02/15
- [Qemu-trivial] [PULL 04/10] configure: add hints to a remedy for feature_not_found errors, Michael Tokarev, 2014/02/15
- [Qemu-trivial] [PULL 02/10] sparc/leon3: Initialize stack pointer, Michael Tokarev, 2014/02/15
- [Qemu-trivial] [PULL 03/10] configure: add hint of libfdt to DTC dependency not found message, Michael Tokarev, 2014/02/15
- [Qemu-trivial] [PULL 05/10] linux-user: refactor do_socketcall(), Michael Tokarev, 2014/02/15
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/10] Trivial patches for 2014-02-15, Peter Maydell, 2014/02/15