USB: fix bug in sg initialization in usbtest

This patch (as1062) fixes a bug in the scatter-gather initialization
code in the usbtest driver.  When the sg-helper conversion was
performed, it wasn't done correctly.

Signed-off-by: Alan Stern <[email protected]>
CC: Jens Axboe <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index da922dfc0dccfefa3c308d35301580fe1e39d82f..b6b5b2affad1deac8d670adea8f050593b6e8bc0 100644 (file)
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -378,6 +378,7 @@ alloc_sglist (int nents, int max, int vary)
        sg = kmalloc (nents * sizeof *sg, GFP_KERNEL);
        if (!sg)
                return NULL;
+       sg_init_table(sg, nents);
 
        for (i = 0; i < nents; i++) {
                char            *buf;
@@ -390,7 +391,7 @@ alloc_sglist (int nents, int max, int vary)
                }
 
                /* kmalloc pages are always physically contiguous! */
-               sg_init_one(&sg[i], buf, size);
+               sg_set_buf(&sg[i], buf, size);
 
                switch (pattern) {
                case 0: