summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-12-09 19:54:32 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-12-09 19:54:32 +0000
commitc60d5cc845a6fdf47c50a12a707b3c39f2202dae (patch)
tree3e3ad95ee30def50deee5f353b3bdb973cfd1b9b /sys/dev
parentf1bd72bb6138ea8bc3661e2090dacfcdd6e20c3e (diff)
At resume, do not spin flushing characters in from the chip. There shouldn't
be any characters. If the chip is not actually there for some reason, we'd be spinning so early in the resume sequence, we'd probably go mad trying to find the reason.. ok kettenis request: people with serial ports on their laptops, try to run a "cu" over a suspend/resume cycle, and see if you see "input noise"
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/com.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index d190fd6fd4c..77f4f4e9d61 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com.c,v 1.155 2013/12/09 19:47:42 deraadt Exp $ */
+/* $OpenBSD: com.c,v 1.156 2013/12/09 19:54:31 deraadt Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*
@@ -669,10 +669,6 @@ com_resume(struct com_softc *sc)
bus_space_write_1(iot, ioh, com_lcr, lcr);
}
- /* Flush any pending I/O. */
- while (ISSET(bus_space_read_1(iot, ioh, com_lsr), LSR_RXRDY))
- (void) bus_space_read_1(iot, ioh, com_data);
-
/* You turn me on, baby! */
bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
bus_space_write_1(iot, ioh, com_ier, sc->sc_ier);