Merge branch 'master'

1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 9d59b901841c..ccc5e8238bd8 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -381,6 +381,7 @@ alloc_sglist (int nents, int max, int vary)
 
         for (i = 0; i < nents; i++) {
                 char            *buf;
+                unsigned        j;
 
                 buf = kzalloc (size, SLAB_KERNEL);
                 if (!buf) {
@@ -391,6 +392,16 @@ alloc_sglist (int nents, int max, int vary)
                 /* 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;
@@ -425,6 +436,8 @@ static int perform_sglist (
                 usb_sg_wait (req);
                 retval = req->status;
 
+                /* FIXME check resulting data pattern */
+
                 /* FIXME if endpoint halted, clear halt (and log) */
         }