GPIO: OMAP: Fixed spurious IRQ issue for GPIO interrupts

[linux-2.6-omap-h63xx.git] / drivers / scsi / eata.c

diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index a73a6bbb1b2bb37d2426c19987992b4f6f1ef49c..be5099dd94b5d4e655385ad59364dbd585da1910 100644 (file)
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -1426,7 +1426,7 @@ static int port_detect(unsigned long port_base, unsigned int j,
 
        if (ha->pdev) {
                pci_set_master(ha->pdev);
-               if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK))
+               if (pci_set_dma_mask(ha->pdev, DMA_BIT_MASK(32)))
                        printk("%s: warning, pci_set_dma_mask failed.\n",
                               ha->board_name);
        }
@@ -1626,8 +1626,15 @@ static void map_dma(unsigned int i, struct hostdata *ha)
 
        cpp->sense_len = SCSI_SENSE_BUFFERSIZE;
 
-       count = scsi_dma_map(SCpnt);
-       BUG_ON(count < 0);
+       if (!scsi_sg_count(SCpnt)) {
+               cpp->data_len = 0;
+               return;
+       }
+
+       count = pci_map_sg(ha->pdev, scsi_sglist(SCpnt), scsi_sg_count(SCpnt),
+                          pci_dir);
+       BUG_ON(!count);
+
        scsi_for_each_sg(SCpnt, sg, count, k) {
                cpp->sglist[k].address = H2DEV(sg_dma_address(sg));
                cpp->sglist[k].num_bytes = H2DEV(sg_dma_len(sg));
@@ -1655,7 +1662,9 @@ static void unmap_dma(unsigned int i, struct hostdata *ha)
                pci_unmap_single(ha->pdev, DEV2H(cpp->sense_addr),
                                 DEV2H(cpp->sense_len), PCI_DMA_FROMDEVICE);
 
-       scsi_dma_unmap(SCpnt);
+       if (scsi_sg_count(SCpnt))
+               pci_unmap_sg(ha->pdev, scsi_sglist(SCpnt), scsi_sg_count(SCpnt),
+                            pci_dir);
 
        if (!DEV2H(cpp->data_len))
                pci_dir = PCI_DMA_BIDIRECTIONAL;