X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fusb%2Fmisc%2Fusbtest.c;fp=drivers%2Fusb%2Fmisc%2Fusbtest.c;h=84fa1728f052969d527ded2e85ffa31e78810784;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=983e104dd4520653baa6f61c4ca2ccff10a16ba5;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 983e104dd..84fa1728f 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1,3 +1,4 @@
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -380,27 +381,17 @@ alloc_sglist (int nents, int max, int vary)
 
 	for (i = 0; i < nents; i++) {
 		char		*buf;
-		unsigned	j;
 
-		buf = kzalloc (size, SLAB_KERNEL);
+		buf = kmalloc (size, SLAB_KERNEL);
 		if (!buf) {
 			free_sglist (sg, i);
 			return NULL;
 		}
+		memset (buf, 0, size);
 
 		/* kmalloc pages are always physically contiguous! */
 		sg_init_one(&sg[i], buf, size);
 
-		switch (pattern) {
-		case 0:
-			/* already zeroed */
-			break;
-		case 1:
-			for (j = 0; j < size; j++)
-				*buf++ = (u8) (j % 63);
-			break;
-		}
-
 		if (vary) {
 			size += vary;
 			size %= max;
@@ -435,8 +426,6 @@ static int perform_sglist (
 		usb_sg_wait (req);
 		retval = req->status;
 
-		/* FIXME check resulting data pattern */
-
 		/* FIXME if endpoint halted, clear halt (and log) */
 	}
 
@@ -801,9 +790,7 @@ error:
 
 				if (u == urb || !u->dev)
 					continue;
-				spin_unlock(&ctx->lock);
 				status = usb_unlink_urb (u);
-				spin_lock(&ctx->lock);
 				switch (status) {
 				case -EINPROGRESS:
 				case -EBUSY:
@@ -855,9 +842,10 @@ test_ctrl_queue (struct usbtest_dev *dev, struct usbtest_param *param)
 	 * as with bulk/intr sglists, sglen is the queue depth; it also
 	 * controls which subtests run (more tests than sglen) or rerun.
 	 */
-	urb = kcalloc(param->sglen, sizeof(struct urb *), SLAB_KERNEL);
+	urb = kmalloc (param->sglen * sizeof (struct urb *), SLAB_KERNEL);
 	if (!urb)
 		return -ENOMEM;
+	memset (urb, 0, param->sglen * sizeof (struct urb *));
 	for (i = 0; i < param->sglen; i++) {
 		int			pipe = usb_rcvctrlpipe (udev, 0);
 		unsigned		len;
@@ -1242,12 +1230,11 @@ done:
 static int ctrl_out (struct usbtest_dev *dev,
 		unsigned count, unsigned length, unsigned vary)
 {
-	unsigned		i, j, len;
-	int			retval;
+	unsigned		i, j, len, retval;
 	u8			*buf;
 	char			*what = "?";
 	struct usb_device	*udev;
-
+	
 	if (length < 1 || length > 0xffff || vary >= length)
 		return -EINVAL;
 
@@ -1337,9 +1324,7 @@ struct iso_context {
 	unsigned		pending;
 	spinlock_t		lock;
 	struct completion	done;
-	int			submit_error;
 	unsigned long		errors;
-	unsigned long		packet_count;
 	struct usbtest_dev	*dev;
 };
 
@@ -1350,14 +1335,10 @@ static void iso_callback (struct urb *urb, struct pt_regs *regs)
 	spin_lock(&ctx->lock);
 	ctx->count--;
 
-	ctx->packet_count += urb->number_of_packets;
 	if (urb->error_count > 0)
 		ctx->errors += urb->error_count;
-	else if (urb->status != 0)
-		ctx->errors += urb->number_of_packets;
 
-	if (urb->status == 0 && ctx->count > (ctx->pending - 1)
-			&& !ctx->submit_error) {
+	if (urb->status == 0 && ctx->count > (ctx->pending - 1)) {
 		int status = usb_submit_urb (urb, GFP_ATOMIC);
 		switch (status) {
 		case 0:
@@ -1368,8 +1349,6 @@ static void iso_callback (struct urb *urb, struct pt_regs *regs)
 					status);
 			/* FALLTHROUGH */
 		case -ENODEV:			/* disconnected */
-		case -ESHUTDOWN:		/* endpoint disabled */
-			ctx->submit_error = 1;
 			break;
 		}
 	}
@@ -1379,8 +1358,8 @@ static void iso_callback (struct urb *urb, struct pt_regs *regs)
 	if (ctx->pending == 0) {
 		if (ctx->errors)
 			dev_dbg (&ctx->dev->intf->dev,
-				"iso test, %lu errors out of %lu\n",
-				ctx->errors, ctx->packet_count);
+				"iso test, %lu errors\n",
+				ctx->errors);
 		complete (&ctx->done);
 	}
 done:
@@ -1441,14 +1420,15 @@ test_iso_queue (struct usbtest_dev *dev, struct usbtest_param *param,
 	struct usb_device	*udev;
 	unsigned		i;
 	unsigned long		packets = 0;
-	int			status = 0;
+	int			status;
 	struct urb		*urbs[10];	/* FIXME no limit */
 
 	if (param->sglen > 10)
 		return -EDOM;
 
-	memset(&context, 0, sizeof context);
 	context.count = param->iterations * param->sglen;
+	context.pending = param->sglen;
+	context.errors = 0;
 	context.dev = dev;
 	init_completion (&context.done);
 	spin_lock_init (&context.lock);
@@ -1480,7 +1460,6 @@ test_iso_queue (struct usbtest_dev *dev, struct usbtest_param *param,
 
 	spin_lock_irq (&context.lock);
 	for (i = 0; i < param->sglen; i++) {
-		++context.pending;
 		status = usb_submit_urb (urbs [i], SLAB_ATOMIC);
 		if (status < 0) {
 			ERROR (dev, "submit iso[%d], error %d\n", i, status);
@@ -1491,26 +1470,12 @@ test_iso_queue (struct usbtest_dev *dev, struct usbtest_param *param,
 
 			simple_free_urb (urbs [i]);
 			context.pending--;
-			context.submit_error = 1;
-			break;
 		}
 	}
 	spin_unlock_irq (&context.lock);
 
 	wait_for_completion (&context.done);
-
-	/*
-	 * Isochronous transfers are expected to fail sometimes.  As an
-	 * arbitrary limit, we will report an error if any submissions
-	 * fail or if the transfer failure rate is > 10%.
-	 */
-	if (status != 0)
-		;
-	else if (context.submit_error)
-		status = -EACCES;
-	else if (context.errors > context.packet_count / 10)
-		status = -EIO;
-	return status;
+	return 0;
 
 fail:
 	for (i = 0; i < param->sglen; i++) {
@@ -1900,9 +1865,10 @@ usbtest_probe (struct usb_interface *intf, const struct usb_device_id *id)
 	}
 #endif
 
-	dev = kzalloc(sizeof(*dev), SLAB_KERNEL);
+	dev = kmalloc (sizeof *dev, SLAB_KERNEL);
 	if (!dev)
 		return -ENOMEM;
+	memset (dev, 0, sizeof *dev);
 	info = (struct usbtest_info *) id->driver_info;
 	dev->info = info;
 	init_MUTEX (&dev->sem);