Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / drivers / scsi / libata-core.c

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 15d0654..7f2d11d 100644 (file)
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2578,6 +2578,7 @@ inline unsigned int ata_host_intr (struct ata_port *ap,
 
        case ATA_PROT_DMA:
        case ATA_PROT_ATAPI_DMA:
+       case ATA_PROT_ATAPI:
                /* check status of DMA engine */
                host_stat = ata_bmdma_status(ap);
                VPRINTK("BUS_DMA (host_stat 0x%X)\n", host_stat);
@@ -3251,10 +3252,10 @@ void ata_pci_remove_one (struct pci_dev *pdev)
        }
 
        free_irq(host_set->irq, host_set);
-       if (host_set->mmio_base)
-               iounmap(host_set->mmio_base);
        if (host_set->ops->host_stop)
                host_set->ops->host_stop(host_set);
+       if (host_set->mmio_base)
+               iounmap(host_set->mmio_base);
 
        for (i = 0; i < host_set->n_ports; i++) {
                ap = host_set->ports[i];