From c4851d92d16ead91eeacf353bb3260972e5baff7 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Tue, 15 Jan 2008 21:10:50 +0100 Subject: [PATCH] --- yaml --- r: 80938 b: refs/heads/master c: b7811da2d94d8e1f77015ec9afa4575ddc9981a4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-sbp2.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9dc6fe748243..87faa3a456a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 285838eb22ef0db77b464da70b7352cdbfffc939 +refs/heads/master: b7811da2d94d8e1f77015ec9afa4575ddc9981a4 diff --git a/trunk/drivers/firewire/fw-sbp2.c b/trunk/drivers/firewire/fw-sbp2.c index 2108cd92451b..8281ad94bd8c 100644 --- a/trunk/drivers/firewire/fw-sbp2.c +++ b/trunk/drivers/firewire/fw-sbp2.c @@ -1107,9 +1107,9 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, * elements larger than 65535 bytes, some IOMMUs may merge sg elements * during DMA mapping, and Linux currently doesn't prevent this. */ - for (i = 0, j = 0; i < count; i++) { - sg_len = sg_dma_len(sg + i); - sg_addr = sg_dma_address(sg + i); + for (i = 0, j = 0; i < count; i++, sg = sg_next(sg)) { + sg_len = sg_dma_len(sg); + sg_addr = sg_dma_address(sg); while (sg_len) { /* FIXME: This won't get us out of the pinch. */ if (unlikely(j >= ARRAY_SIZE(orb->page_table))) {