Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f778089c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents db7a89db d136552e

drivers/scsi/aic94xx/aic94xx_task.c

+2 −2
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static int asd_build_smp_ascb(struct asd_ascb *ascb, struct sas_task *task, 
	struct scb *scb;



	pci_map_sg(asd_ha->pcidev, &task->smp_task.smp_req, 1,

		   PCI_DMA_FROMDEVICE);

		   PCI_DMA_TODEVICE);

	pci_map_sg(asd_ha->pcidev, &task->smp_task.smp_resp, 1,

		   PCI_DMA_FROMDEVICE);
@@ -486,7 +486,7 @@ static void asd_unbuild_smp_ascb(struct asd_ascb *a) 


	BUG_ON(!task);

	pci_unmap_sg(a->ha->pcidev, &task->smp_task.smp_req, 1,

		     PCI_DMA_FROMDEVICE);

		     PCI_DMA_TODEVICE);

	pci_unmap_sg(a->ha->pcidev, &task->smp_task.smp_resp, 1,

		     PCI_DMA_FROMDEVICE);

}