summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/sparc64/dev/vldcp.c4
-rw-r--r--sys/dev/usb/uhid.c6
-rw-r--r--sys/dev/vscsi.c4
-rw-r--r--sys/net/switchctl.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/sparc64/dev/vldcp.c b/sys/arch/sparc64/dev/vldcp.c
index fa28639dae3..91255700c5f 100644
--- a/sys/arch/sparc64/dev/vldcp.c
+++ b/sys/arch/sparc64/dev/vldcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vldcp.c,v 1.18 2019/10/12 15:55:31 cheloha Exp $ */
+/* $OpenBSD: vldcp.c,v 1.19 2019/12/19 12:04:38 reyk Exp $ */
/*
* Copyright (c) 2009, 2012 Mark Kettenis
*
@@ -584,7 +584,7 @@ vldcppoll(dev_t dev, int events, struct proc *p)
sc = vldcp_lookup(dev);
if (sc == NULL)
- return (ENXIO);
+ return (POLLERR);
lc = &sc->sc_lc;
s = spltty();
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 7cc74837a88..440677deeaf 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhid.c,v 1.73 2019/12/17 13:08:54 reyk Exp $ */
+/* $OpenBSD: uhid.c,v 1.74 2019/12/19 12:04:38 reyk Exp $ */
/* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -413,10 +413,10 @@ uhidpoll(dev_t dev, int events, struct proc *p)
int s;
if ((sc = uhid_lookup(dev)) == NULL)
- return (ENXIO);
+ return (POLLERR);
if (usbd_is_dying(sc->sc_hdev.sc_udev))
- return (POLLERR);
+ return (POLLHUP);
s = splusb();
if (events & (POLLOUT | POLLWRNORM))
diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c
index cdba3e84048..8fa7598dfa8 100644
--- a/sys/dev/vscsi.c
+++ b/sys/dev/vscsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vscsi.c,v 1.41 2017/02/12 17:12:37 chl Exp $ */
+/* $OpenBSD: vscsi.c,v 1.42 2019/12/19 12:04:38 reyk Exp $ */
/*
* Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
@@ -537,7 +537,7 @@ vscsipoll(dev_t dev, int events, struct proc *p)
int revents = 0;
if (sc == NULL)
- return (ENXIO);
+ return (POLLERR);
if (events & (POLLIN | POLLRDNORM)) {
mtx_enter(&sc->sc_state_mtx);
diff --git a/sys/net/switchctl.c b/sys/net/switchctl.c
index af63899e89a..7a8f746cc87 100644
--- a/sys/net/switchctl.c
+++ b/sys/net/switchctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: switchctl.c,v 1.16 2019/10/16 10:20:48 mpi Exp $ */
+/* $OpenBSD: switchctl.c,v 1.17 2019/12/19 12:04:38 reyk Exp $ */
/*
* Copyright (c) 2016 Kazuya GODA <goda@openbsd.org>
@@ -361,7 +361,7 @@ switchpoll(dev_t dev, int events, struct proc *p)
struct switch_softc *sc = switch_dev2sc(dev);
if (sc == NULL)
- return (ENXIO);
+ return (POLLERR);
if (events & (POLLIN | POLLRDNORM)) {
if (!mq_empty(&sc->sc_swdev->swdev_outq) ||