aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-07-04 13:09:05 +0100
committerMatt Fleming <matt.fleming@intel.com>2013-07-04 13:36:32 +0100
commitbbcc4b4933f0c449e6e3b40dc03f95e70ce7fb1c (patch)
treef35400efcdbce96be40ce5f9718eeb015a706c2d
parent67671a51bb04fd978ca17ba22aeb5de1623960aa (diff)
parent61291b1e3ec0687f464a4c5b1ff17a1f944d52a0 (diff)
downloadsyslinux-bbcc4b4933f0c449e6e3b40dc03f95e70ce7fb1c.tar.gz
Merge tag 'syslinux-5.11-pre4' into firmware
syslinux-5.11-pre4
-rw-r--r--core/conio.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/core/conio.c b/core/conio.c
index 5587203f..d388edaa 100644
--- a/core/conio.c
+++ b/core/conio.c
@@ -167,8 +167,8 @@ int bios_pollchar(void)
/* Already-queued input? */
if (SerialTail == SerialHead) {
/* LSR */
- data = !(inb(SerialPort + 5) & 1);
- if (!data) {
+ data = inb(SerialPort + 5) & 1;
+ if (data) {
/* MSR */
data = inb(SerialPort + 6);
@@ -179,8 +179,7 @@ int bios_pollchar(void)
data = 1;
else
data = 0;
- } else
- data = 1;
+ }
} else
data = 1;
sti();