diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 05:48:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 05:48:06 +0100 |
| commit | 9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (patch) | |
| tree | 27a73405d3652dc6771fab28721b70e6d44ff47a /drivers/usb | |
| parent | [PATCH] mm/filemap.c:filemap_populate(): move export. (diff) | |
| parent | [CRYPTO] Check cra_alignmask against cra_blocksize (diff) | |
| download | linux-9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43.tar.xz linux-9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/misc/usbtest.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index 90a96257d6ce..2997f558159b 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c @@ -9,7 +9,7 @@ #include <linux/mm.h> #include <linux/module.h> #include <linux/moduleparam.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/usb.h> @@ -381,7 +381,6 @@ alloc_sglist (int nents, int max, int vary) sg = kmalloc (nents * sizeof *sg, SLAB_KERNEL); if (!sg) return NULL; - memset (sg, 0, nents * sizeof *sg); for (i = 0; i < nents; i++) { char *buf; @@ -394,9 +393,7 @@ alloc_sglist (int nents, int max, int vary) memset (buf, 0, size); /* kmalloc pages are always physically contiguous! */ - sg [i].page = virt_to_page (buf); - sg [i].offset = offset_in_page (buf); - sg [i].length = size; + sg_init_one(&sg[i], buf, size); if (vary) { size += vary; |