summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2004-12-22 17:31:44 +0000
committerphk <phk@FreeBSD.org>2004-12-22 17:31:44 +0000
commit9fa6e5be504794d75d4d016c6b01e0c2c70efe6e (patch)
treeae0c97fc839cd9798a31c972276bc49fd5343060 /sys/dev/usb
parente8343221166ec53840750bcc1adc3933f5b0628e (diff)
downloadFreeBSD-src-9fa6e5be504794d75d4d016c6b01e0c2c70efe6e.zip
FreeBSD-src-9fa6e5be504794d75d4d016c6b01e0c2c70efe6e.tar.gz
Don't include vnode.h.
Check O_NONBLOCK instead of IO_NDELAY
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/ugen.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 05e7ade..58508ac 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
#include <sys/poll.h>
#include <sys/sysctl.h>
#include <sys/uio.h>
-#include <sys/vnode.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
@@ -721,7 +720,7 @@ ugen_do_read(struct ugen_softc *sc, int endpt, struct uio *uio, int flag)
/* Block until activity occurred. */
s = splusb();
while (sce->q.c_cc == 0) {
- if (flag & IO_NDELAY) {
+ if (flag & O_NONBLOCK) {
splx(s);
return (EWOULDBLOCK);
}
@@ -785,7 +784,7 @@ ugen_do_read(struct ugen_softc *sc, int endpt, struct uio *uio, int flag)
case UE_ISOCHRONOUS:
s = splusb();
while (sce->cur == sce->fill) {
- if (flag & IO_NDELAY) {
+ if (flag & O_NONBLOCK) {
splx(s);
return (EWOULDBLOCK);
}
OpenPOWER on IntegriCloud