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

MFC r272480:

Browse Source 
When we fail to get a USB reference we should just return, because
there are no more references held.
This commit is contained in:
hselasky 2014-10-06 06:05:43 +00:00
parent f5788ce956
commit c2da2fb6f1
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/usb/usb_dev.c
View File

@ -299,6 +299,10 @@ usb_ref_device(struct usb_cdev_privdata *cpd,
}
mtx_unlock(&usb_ref_lock);
DPRINTFN(2, "fail\n");
/* clear all refs */
memset(crd, 0, sizeof(*crd));
return (USB_ERR_INVAL);
}
@ -1094,8 +1098,8 @@ usb_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int fflag, struct thread*
goto done;
if (usb_usb_ref_device(cpd, &refs)) {
err = ENXIO;
goto done;
/* we lost the reference */
return (ENXIO);
}
err = (f->methods->f_ioctl_post) (f, cmd, addr, fflags);
@ -1118,9 +1122,8 @@ usb_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int fflag, struct thread*
while (usb_ref_device(cpd, &refs, 1 /* need uref */)) {
if (usb_ref_device(cpd, &refs, 0)) {
/* device no longer exits */
err = ENXIO;
goto done;
/* device no longer exists */
return (ENXIO);
}
usb_unref_device(cpd, &refs);
usb_pause_mtx(NULL, hz / 128);
@ -1412,9 +1415,9 @@ usb_read(struct cdev *dev, struct uio *uio, int ioflag)
return (err);
err = usb_ref_device(cpd, &refs, 0 /* no uref */ );
if (err) {
if (err)
return (ENXIO);
}
fflags = cpd->fflags;
f = refs.rxfifo;
@ -1538,9 +1541,9 @@ usb_write(struct cdev *dev, struct uio *uio, int ioflag)
return (err);
err = usb_ref_device(cpd, &refs, 0 /* no uref */ );
if (err) {
if (err)
return (ENXIO);
}
fflags = cpd->fflags;
f = refs.txfifo;