diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-10 18:56:19 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-10 18:56:19 (GMT) |
| commit | 0893dd327ffacb83dcca9033d2891d57b4024d6b (patch) | |
| tree | dc7f614efa213e5939b32ef71209d832b28256fc | |
| parent | 606867443764edac5a2c542f2fa0a12ef7a7c7fd (diff) | |
| parent | 42517438f9c1011a03e49a542cba32ac5a80dd8e (diff) | |
| download | linux-0893dd327ffacb83dcca9033d2891d57b4024d6b.tar.xz | |
Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/sata_sx4.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 794fb55..6a75ec2 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -385,6 +385,7 @@ int ata_scsi_error(struct Scsi_Host *host) * appropriate place */ host->host_failed--; + INIT_LIST_HEAD(&host->eh_cmd_q); DPRINTK("EXIT\n"); return 0; diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c index 140cea0..efd7d7a 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) for (i = 0; i < last; i++) { buf[idx++] = cpu_to_le32(sg_dma_address(&sg[i])); buf[idx++] = cpu_to_le32(sg_dma_len(&sg[i])); - total_len += sg[i].length; + total_len += sg_dma_len(&sg[i]); } buf[idx - 1] |= cpu_to_le32(ATA_PRD_EOT); sgt_len = idx * 4; |