summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2011-07-03 18:11:21 +0000
committernicm <nicm@openbsd.org>2011-07-03 18:11:21 +0000
commitbcc550fb302b3ced76fbb467b759d8aa67fbad52 (patch)
treed2356fca578bb6ee37dcf1f8c0aef6c1ab64ecde
parentCleanup vnd(4) a bit now that it only has one mode of operation and (diff)
downloadwireguard-openbsd-bcc550fb302b3ced76fbb467b759d8aa67fbad52.tar.xz
wireguard-openbsd-bcc550fb302b3ced76fbb467b759d8aa67fbad52.zip
Fix return values of wsdisplaykqfilter and move some code so it matches
wsdisplaypoll. ok miod deraadt
-rw-r--r--sys/dev/wscons/wsdisplay.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 70b169b2494..5bf2f31ea37 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.104 2011/06/23 16:31:16 deraadt Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.105 2011/07/03 18:11:21 nicm Exp $ */
/* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
/*
@@ -1411,15 +1411,15 @@ wsdisplaykqfilter(dev_t dev, struct knote *kn)
struct wsscreen *scr;
if (ISWSDISPLAYCTL(dev))
- return (1);
+ return (ENXIO);
if ((scr = sc->sc_scr[WSDISPLAYSCREEN(dev)]) == NULL)
- return (1);
+ return (ENXIO);
- if (WSSCREEN_HAS_TTY(scr))
- return (ttkqfilter(dev, kn));
- else
- return (1);
+ if (!WSSCREEN_HAS_TTY(scr))
+ return (ENXIO);
+
+ return (ttkqfilter(dev, kn));
}
void