From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 31 May 2005 15:53:57 +0000 (-0400)
Subject: [libata] ahci: Update for recent ->host_stop() API change
X-Git-Tag: v2.6.13-rc1~90^2~583^2~56^2~6^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ead5de996fc35f97fa120b414bfc098f1bca29d2;p=linux-2.6

[libata] ahci: Update for recent ->host_stop() API change
---

diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index ee53b227c0..eb7940aba4 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);
 }