svn commit: r272612 - releng/10.1/sys/dev/usb

[Hans Petter Selasky]

Author: hselasky
Date: Mon Oct  6 12:08:47 2014
New Revision: 272612
URL: https://svnweb.freebsd.org/changeset/base/272612

Log:
  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

Modified:
  releng/10.1/sys/dev/usb/usb_dev.c
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/sys/dev/usb/usb_dev.c
==============================================================================
--- releng/10.1/sys/dev/usb/usb_dev.c	Mon Oct  6 12:08:14 2014	(r272611)
+++ releng/10.1/sys/dev/usb/usb_dev.c	Mon Oct  6 12:08:47 2014	(r272612)
@@ -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, 
 		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, 
 
 		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 *u
 		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 *
 		return (err);
 
 	err = usb_ref_device(cpd, &refs, 0 /* no uref */ );
-	if (err) {
+	if (err)
 		return (ENXIO);
-	}
+
 	fflags = cpd->fflags;
 
 	f = refs.txfifo;