X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fmisc%2Fusbtest.c;h=a03b8d44a782cbdb989ee65e79579d40e52924f7;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=8ee1b05ea879dec99b069bad2a10150271550d17;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 8ee1b05ea..a03b8d44a 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1054,8 +1054,7 @@ static int unlink1 (struct usbtest_dev *dev, int pipe, int size, int async)
 	urb = simple_alloc_urb (testdev_to_usbdev (dev), pipe, size);
 	if (!urb)
 		return -ENOMEM;
-	if (async)
-		urb->transfer_flags |= URB_ASYNC_UNLINK;
+	urb->transfer_flags |= URB_ASYNC_UNLINK;
 	urb->context = &completion;
 	urb->complete = unlink1_callback;
 
@@ -1074,17 +1073,20 @@ static int unlink1 (struct usbtest_dev *dev, int pipe, int size, int async)
 	 * hcd states and code paths, even with little other system load.
 	 */
 	msleep (jiffies % (2 * INTERRUPT_RATE));
+	if (async) {
 retry:
-	retval = usb_unlink_urb (urb);
-	if (retval == -EBUSY || retval == -EIDRM) {
-		/* we can't unlink urbs while they're completing.
-		 * or if they've completed, and we haven't resubmitted.
-		 * "normal" drivers would prevent resubmission, but
-		 * since we're testing unlink paths, we can't.
-		 */
-		dev_dbg (&dev->intf->dev, "unlink retry\n");
-		goto retry;
-	}
+		retval = usb_unlink_urb (urb);
+		if (retval == -EBUSY || retval == -EIDRM) {
+			/* we can't unlink urbs while they're completing.
+			 * or if they've completed, and we haven't resubmitted.
+			 * "normal" drivers would prevent resubmission, but
+			 * since we're testing unlink paths, we can't.
+			 */
+			dev_dbg (&dev->intf->dev, "unlink retry\n");
+			goto retry;
+		}
+	} else
+		usb_kill_urb (urb);
 	if (!(retval == 0 || retval == -EINPROGRESS)) {
 		dev_dbg (&dev->intf->dev, "unlink fail %d\n", retval);
 		return retval;
@@ -1095,9 +1097,10 @@ retry:
 	simple_free_urb (urb);
 
 	if (async)
-		return (retval != -ECONNRESET) ? -ECONNRESET : 0;
+		return (retval == -ECONNRESET) ? 0 : retval - 1000;
 	else
-		return (retval != -ENOENT) ? -ENOENT : 0;
+		return (retval == -ENOENT || retval == -EPERM) ?
+				0 : retval - 2000;
 }
 
 static int unlink_simple (struct usbtest_dev *dev, int pipe, int len)