diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-01-15 15:10:50 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-01-30 16:22:22 -0500 |
commit | b7811da2d94d8e1f77015ec9afa4575ddc9981a4 (patch) | |
tree | 4f748f80416635303fbe9d82e19aa65d7777e847 /drivers/firewire | |
parent | 285838eb22ef0db77b464da70b7352cdbfffc939 (diff) |
firewire: fw-sbp2: prepare for s/g chaining
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r-- | drivers/firewire/fw-sbp2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index 2108cd92451b..8281ad94bd8c 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c | |||
@@ -1107,9 +1107,9 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, | |||
1107 | * elements larger than 65535 bytes, some IOMMUs may merge sg elements | 1107 | * elements larger than 65535 bytes, some IOMMUs may merge sg elements |
1108 | * during DMA mapping, and Linux currently doesn't prevent this. | 1108 | * during DMA mapping, and Linux currently doesn't prevent this. |
1109 | */ | 1109 | */ |
1110 | for (i = 0, j = 0; i < count; i++) { | 1110 | for (i = 0, j = 0; i < count; i++, sg = sg_next(sg)) { |
1111 | sg_len = sg_dma_len(sg + i); | 1111 | sg_len = sg_dma_len(sg); |
1112 | sg_addr = sg_dma_address(sg + i); | 1112 | sg_addr = sg_dma_address(sg); |
1113 | while (sg_len) { | 1113 | while (sg_len) { |
1114 | /* FIXME: This won't get us out of the pinch. */ | 1114 | /* FIXME: This won't get us out of the pinch. */ |
1115 | if (unlikely(j >= ARRAY_SIZE(orb->page_table))) { | 1115 | if (unlikely(j >= ARRAY_SIZE(orb->page_table))) { |