summaryrefslogtreecommitdiff
path: root/sys/scsi/cd.c
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2010-01-12 23:33:58 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2010-01-12 23:33:58 +0000
commit17dabbf332d06a8ff557075a4ef65f57c8e92390 (patch)
tree834b999fe2e031672b3a6a75ff9e5e70dc50dead /sys/scsi/cd.c
parent1927861651d7ea620060a826a41e5dd4481324e2 (diff)
bring sd.c r1.180 over to the other drivers now using the antisemaphore,
ie, dont clear the WAITING flag when restarting the xxstart loops.
Diffstat (limited to 'sys/scsi/cd.c')
-rw-r--r--sys/scsi/cd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 918e3f77f05..b2dc1ad01d6 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.160 2010/01/11 08:56:17 krw Exp $ */
+/* $OpenBSD: cd.c,v 1.161 2010/01/12 23:33:57 dlg Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -619,8 +619,8 @@ cdstart(void *v)
return;
}
mtx_leave(&sc->sc_start_mtx);
-restart:
CLR(sc->sc_flags, CDF_WAITING);
+restart:
while (!ISSET(sc->sc_flags, CDF_WAITING) &&
(bp = cd_buf_dequeue(sc)) != NULL) {