diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 13:41:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 13:41:06 -0400 |
| commit | f778089cb2445dfc6dfd30a7a567925fd8589f1e (patch) | |
| tree | 6840ee9f6364f6f4424f948c151abee2e609fec5 /drivers/scsi | |
| parent | db7a89db5e3bc6ba131965183577b15fd6fc92cc (diff) | |
| parent | d136552e8beadcf5e59089292e2ba44f09e3aad8 (diff) | |
Merge branch 'sas-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'sas-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
aic94xx: fix DMA data direction for SMP requests
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_task.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c index d5d8caba3560..ab13824df856 100644 --- a/drivers/scsi/aic94xx/aic94xx_task.c +++ b/drivers/scsi/aic94xx/aic94xx_task.c | |||
| @@ -451,7 +451,7 @@ static int asd_build_smp_ascb(struct asd_ascb *ascb, struct sas_task *task, | |||
| 451 | struct scb *scb; | 451 | struct scb *scb; |
| 452 | 452 | ||
| 453 | pci_map_sg(asd_ha->pcidev, &task->smp_task.smp_req, 1, | 453 | pci_map_sg(asd_ha->pcidev, &task->smp_task.smp_req, 1, |
| 454 | PCI_DMA_FROMDEVICE); | 454 | PCI_DMA_TODEVICE); |
| 455 | pci_map_sg(asd_ha->pcidev, &task->smp_task.smp_resp, 1, | 455 | pci_map_sg(asd_ha->pcidev, &task->smp_task.smp_resp, 1, |
| 456 | PCI_DMA_FROMDEVICE); | 456 | PCI_DMA_FROMDEVICE); |
| 457 | 457 | ||
| @@ -486,7 +486,7 @@ static void asd_unbuild_smp_ascb(struct asd_ascb *a) | |||
| 486 | 486 | ||
| 487 | BUG_ON(!task); | 487 | BUG_ON(!task); |
| 488 | pci_unmap_sg(a->ha->pcidev, &task->smp_task.smp_req, 1, | 488 | pci_unmap_sg(a->ha->pcidev, &task->smp_task.smp_req, 1, |
| 489 | PCI_DMA_FROMDEVICE); | 489 | PCI_DMA_TODEVICE); |
| 490 | pci_unmap_sg(a->ha->pcidev, &task->smp_task.smp_resp, 1, | 490 | pci_unmap_sg(a->ha->pcidev, &task->smp_task.smp_resp, 1, |
| 491 | PCI_DMA_FROMDEVICE); | 491 | PCI_DMA_FROMDEVICE); |
| 492 | } | 492 | } |