d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include vnode.h.

Browse Source 
Check O_NONBLOCK instead of IO_NDELAY
This commit is contained in:
Poul-Henning Kamp 2004-12-22 17:31:44 +00:00
parent 0fbc5ec63e
commit 7df050f9a8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=139198
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/usb/ugen.c
View File

@ -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);
}