From 5aef54b8cecc2d3525aeb59c488eafc1f2444829 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Mon, 16 Jun 2008 12:11:39 -0400 Subject: [PATCH] --- yaml --- r: 104599 b: refs/heads/master c: 7c3e28bc56bd2e4310dc0af99f2b95eeda9a2ff7 h: refs/heads/master i: 104597: d713762e210312dca37633966228ca37d7cc8786 104595: 7f007133c1d92aa4b56ece2020c82679d069fc7c 104591: a42b68d63bb88c1a606efbd2eccf043fd80d3635 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/message.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index bc26e49c557c..dcb4bd5ba636 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 625f694936cbbdee98e6cc65f72724a7660e7946 +refs/heads/master: 7c3e28bc56bd2e4310dc0af99f2b95eeda9a2ff7 diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c index 315363b744a3..08af1083ebfc 100644 --- a/trunk/drivers/usb/core/message.c +++ b/trunk/drivers/usb/core/message.c @@ -400,7 +400,7 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev, if (usb_pipein(pipe)) urb_flags |= URB_SHORT_NOT_OK; - for (i = 0; i < io->entries; i++) { + for_each_sg(sg, sg, io->entries, i) { unsigned len; io->urbs[i] = usb_alloc_urb(0, mem_flags); @@ -434,17 +434,17 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev, * to prevent stale pointers and to help spot bugs. */ if (dma) { - io->urbs[i]->transfer_dma = sg_dma_address(sg + i); - len = sg_dma_len(sg + i); + io->urbs[i]->transfer_dma = sg_dma_address(sg); + len = sg_dma_len(sg); #if defined(CONFIG_HIGHMEM) || defined(CONFIG_GART_IOMMU) io->urbs[i]->transfer_buffer = NULL; #else - io->urbs[i]->transfer_buffer = sg_virt(&sg[i]); + io->urbs[i]->transfer_buffer = sg_virt(sg); #endif } else { /* hc may use _only_ transfer_buffer */ - io->urbs[i]->transfer_buffer = sg_virt(&sg[i]); - len = sg[i].length; + io->urbs[i]->transfer_buffer = sg_virt(sg); + len = sg->length; } if (length) {