git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
scsi
/
libata-core.c
diff --git
a/drivers/scsi/libata-core.c
b/drivers/scsi/libata-core.c
index
7f2d11d
..
15d0654
100644
(file)
--- a/
drivers/scsi/libata-core.c
+++ b/
drivers/scsi/libata-core.c
@@
-2578,7
+2578,6
@@
inline unsigned int ata_host_intr (struct ata_port *ap,
case ATA_PROT_DMA:
case ATA_PROT_ATAPI_DMA:
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);
/* check status of DMA engine */
host_stat = ata_bmdma_status(ap);
VPRINTK("BUS_DMA (host_stat 0x%X)\n", host_stat);
@@
-3252,10
+3251,10
@@
void ata_pci_remove_one (struct pci_dev *pdev)
}
free_irq(host_set->irq, host_set);
}
free_irq(host_set->irq, host_set);
- if (host_set->ops->host_stop)
- host_set->ops->host_stop(host_set);
if (host_set->mmio_base)
iounmap(host_set->mmio_base);
if (host_set->mmio_base)
iounmap(host_set->mmio_base);
+ if (host_set->ops->host_stop)
+ host_set->ops->host_stop(host_set);
for (i = 0; i < host_set->n_ports; i++) {
ap = host_set->ports[i];
for (i = 0; i < host_set->n_ports; i++) {
ap = host_set->ports[i];