This handles some SMP unlink modes properly. Please merge.

- Dave
Handle some SMP-visible unlink states better.

--- x26/drivers/usb/misc/usbtest.c      2004-04-19 19:42:30.000000000 -0700
+++ gadget-2.6/drivers/usb/misc/usbtest.c       2004-04-14 20:23:11.000000000 -0700
@@ -802,6 +802,7 @@
                                switch (status) {
                                case -EINPROGRESS:
                                case -EBUSY:
+                               case -EIDRM:
                                        continue;
                                default:
                                        dbg ("urb unlink --> %d", status);
@@ -1038,8 +1039,6 @@
        if (!status)
                status = usb_submit_urb (urb, SLAB_ATOMIC);
        if (status) {
-               if (status == -ECONNRESET || status == -ENOENT)
-                       status = 0;
                urb->status = status;
                complete ((struct completion *) urb->context);
        }
@@ -1077,8 +1076,9 @@
        wait_ms (jiffies % (2 * INTERRUPT_RATE));
 retry:
        retval = usb_unlink_urb (urb);
-       if (retval == -EBUSY) {
+       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.
                 */

Reply via email to