summaryrefslogtreecommitdiffstats
path: root/sys/dev/midi.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2009-11-09 17:53:38 +0000
committernicm <nicm@openbsd.org>2009-11-09 17:53:38 +0000
commit270ebf02128560a47b9b980515d58ee07855c8d6 (patch)
tree06084a8310af5d7c4a5ed9051f17b82a6efd7075 /sys/dev/midi.c
parentdocument -F downgrades (note: for now, it's just the package name, we should (diff)
downloadwireguard-openbsd-270ebf02128560a47b9b980515d58ee07855c8d6.tar.xz
wireguard-openbsd-270ebf02128560a47b9b980515d58ee07855c8d6.zip
Every selwakeup() should have a matching KNOTE() (even if kqueue isn't
supported it doesn't do any harm), so put the KNOTE() in selwakeup() itself and remove it from any occurences where both are used, except one for kqueue itself and one in sys_pipe.c (where the selwakeup is under a PIPE_SEL flag). Based on a diff from tedu. ok deraadt
Diffstat (limited to 'sys/dev/midi.c')
-rw-r--r--sys/dev/midi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index 53e2aef6062..64b41efc205 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: midi.c,v 1.20 2009/11/01 20:14:12 nicm Exp $ */
+/* $OpenBSD: midi.c,v 1.21 2009/11/09 17:53:39 nicm Exp $ */
/*
* Copyright (c) 2003, 2004 Alexandre Ratchov
@@ -124,7 +124,6 @@ midi_iintr(void *addr, int data)
wakeup(&sc->rchan);
}
selwakeup(&sc->rsel);
- KNOTE(&sc->rsel.si_note, 0);
if (sc->async)
psignal(sc->async, SIGIO);
}
@@ -224,7 +223,6 @@ midi_out_stop(struct midi_softc *sc)
wakeup(&sc->wchan);
}
selwakeup(&sc->wsel);
- KNOTE(&sc->wsel.si_note, 0);
if (sc->async)
psignal(sc->async, SIGIO);
}