diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-10 14:56:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-10 14:56:19 -0400 |
| commit | 0893dd327ffacb83dcca9033d2891d57b4024d6b (patch) | |
| tree | dc7f614efa213e5939b32ef71209d832b28256fc /drivers/scsi/sata_sx4.c | |
| parent | 606867443764edac5a2c542f2fa0a12ef7a7c7fd (diff) | |
| parent | 42517438f9c1011a03e49a542cba32ac5a80dd8e (diff) | |
Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/sata_sx4.c')
| -rw-r--r-- | drivers/scsi/sata_sx4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c index 140cea05de3f..efd7d7a61135 100644 --- a/drivers/scsi/sata_sx4.c +++ b/drivers/scsi/sata_sx4.c | |||
| @@ -468,7 +468,7 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc) | |||
| 468 | for (i = 0; i < last; i++) { | 468 | for (i = 0; i < last; i++) { |
| 469 | buf[idx++] = cpu_to_le32(sg_dma_address(&sg[i])); | 469 | buf[idx++] = cpu_to_le32(sg_dma_address(&sg[i])); |
| 470 | buf[idx++] = cpu_to_le32(sg_dma_len(&sg[i])); | 470 | buf[idx++] = cpu_to_le32(sg_dma_len(&sg[i])); |
| 471 | total_len += sg[i].length; | 471 | total_len += sg_dma_len(&sg[i]); |
| 472 | } | 472 | } |
| 473 | buf[idx - 1] |= cpu_to_le32(ATA_PRD_EOT); | 473 | buf[idx - 1] |= cpu_to_le32(ATA_PRD_EOT); |
| 474 | sgt_len = idx * 4; | 474 | sgt_len = idx * 4; |