ChangeSet 1.1994.3.1, 2005/03/07 01:52:19-05:00, [EMAIL PROTECTED]
Merge pobox.com:/garz/repo/linux-2.6
into pobox.com:/garz/repo/libata-dev/remove-one-fix
libata-core.c | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
--- a/drivers/scsi/libata-core.c 2005-03-07 11:32:14 -08:00
+++ b/drivers/scsi/libata-core.c 2005-03-07 11:32:14 -08:00
@@ -3884,26 +3884,22 @@
ap = host_set->ports[i];
ata_scsi_release(ap->host);
- scsi_host_put(ap->host);
- }
-
- pci_release_regions(pdev);
-
- for (i = 0; i < host_set->n_ports; i++) {
- struct ata_ioports *ioaddr;
-
- ap = host_set->ports[i];
- ioaddr = &ap->ioaddr;
if ((ap->flags & ATA_FLAG_NO_LEGACY) == 0) {
+ struct ata_ioports *ioaddr = &ap->ioaddr;
+
if (ioaddr->cmd_addr == 0x1f0)
release_region(0x1f0, 8);
else if (ioaddr->cmd_addr == 0x170)
release_region(0x170, 8);
}
+
+ scsi_host_put(ap->host);
}
kfree(host_set);
+
+ pci_release_regions(pdev);
pci_disable_device(pdev);
dev_set_drvdata(dev, NULL);
}
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
