summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-05-31 11:53:57 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-31 11:53:57 -0400
commitead5de996fc35f97fa120b414bfc098f1bca29d2 (patch)
treea9ec0a6394f6cb6cabe4e7d204aa350d631daea3
parentedb3e182b6f33c91ba8778e2198220c12712d3ad (diff)
downloadblackbird-op-linux-ead5de996fc35f97fa120b414bfc098f1bca29d2.tar.gz
blackbird-op-linux-ead5de996fc35f97fa120b414bfc098f1bca29d2.zip
[libata] ahci: Update for recent ->host_stop() API change
-rw-r--r--drivers/scsi/ahci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index ee53b227c01e..eb7940aba400 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -39,7 +39,7 @@
#include <asm/io.h>
#define DRV_NAME "ahci"
-#define DRV_VERSION "1.00"
+#define DRV_VERSION "1.01"
enum {
@@ -1086,8 +1086,6 @@ static void ahci_remove_one (struct pci_dev *pdev)
have_msi = hpriv->have_msi;
free_irq(host_set->irq, host_set);
- host_set->ops->host_stop(host_set);
- iounmap(host_set->mmio_base);
for (i = 0; i < host_set->n_ports; i++) {
ap = host_set->ports[i];
@@ -1096,12 +1094,14 @@ static void ahci_remove_one (struct pci_dev *pdev)
scsi_host_put(ap->host);
}
+ host_set->ops->host_stop(host_set);
+ kfree(host_set);
+
if (have_msi)
pci_disable_msi(pdev);
else
pci_intx(pdev, 0);
pci_release_regions(pdev);
- kfree(host_set);
pci_disable_device(pdev);
dev_set_drvdata(dev, NULL);
}
OpenPOWER on IntegriCloud