diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-10-06 12:08:47 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-10-06 12:08:47 +0000 |
| commit | 578c8b11af8397f143fcc606dbbf8e36ae12f538 (patch) | |
| tree | e17548d81f61169985d4c011d9ab14d75bdbd3e6 /sys/dev | |
| parent | 6427acc0a0263661379434045c7a448e87e7ca94 (diff) | |
| download | FreeBSD-src-578c8b11af8397f143fcc606dbbf8e36ae12f538.zip FreeBSD-src-578c8b11af8397f143fcc606dbbf8e36ae12f538.tar.gz | |
MFC r272480:
When we fail to get a USB reference we should just return, because
there are no more references held.
Approved by: re, marius
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/usb_dev.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c index 6ad02a7..ddc6472 100644 --- a/sys/dev/usb/usb_dev.c +++ b/sys/dev/usb/usb_dev.c @@ -299,6 +299,10 @@ error: } 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; |
