commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / drivers / usb / misc / usbtest.c

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index fc8ecb6..3e5b387 100644 (file)
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -471,7 +471,7 @@ static int ch9_postconfig (struct usbtest_dev *dev)
                 * they're ordered meaningfully in this array
                 */
                if (iface->altsetting [i].desc.bAlternateSetting != i) {
-                       dbg ("%s, illegal alt [%d].bAltSetting = %d",
+                       dbg ("%s, invalid alt [%d].bAltSetting = %d",
                                        dev->id, i, 
                                        iface->altsetting [i].desc
                                                .bAlternateSetting);
@@ -695,8 +695,9 @@ error:
                         */
 
                        /* unlink whatever's still pending */
-                       for (i = 0; i < ctx->param->sglen; i++) {
-                               struct urb      *u = ctx->urb [i];
+                       for (i = 1; i < ctx->param->sglen; i++) {
+                               struct urb      *u = ctx->urb [
+       (i + subcase->number) % ctx->param->sglen];
 
                                if (u == urb || !u->dev)
                                        continue;
@@ -893,7 +894,8 @@ test_ctrl_queue (struct usbtest_dev *dev, struct usbtest_param *param)
        /* FIXME  set timer and time out; provide a disconnect hook */
 
        /* wait for the last one to complete */
-       wait_for_completion (&context.complete);
+       if (context.pending > 0)
+               wait_for_completion (&context.complete);
 
 cleanup:
        for (i = 0; i < param->sglen; i++) {
@@ -1374,6 +1376,7 @@ static void usbtest_disconnect (struct usb_interface *intf)
 
        usb_set_intfdata (intf, NULL);
        info ("unbound %s", dev->id);
+       kfree (dev);
 }
 
 /* Basic testing only needs a device that can source or sink bulk traffic.