From 4fd7deccc43eb973009aff0069a8546536bc4151 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Tue, 31 May 2005 11:53:57 -0400 Subject: [PATCH] --- yaml --- r: 2165 b: refs/heads/master c: ead5de996fc35f97fa120b414bfc098f1bca29d2 h: refs/heads/master i: 2163: b536690f3a6ae129ba8db90a45a497805526f3ec v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ahci.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5c491be28e1d..af1e47652ef8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edb3e182b6f33c91ba8778e2198220c12712d3ad +refs/heads/master: ead5de996fc35f97fa120b414bfc098f1bca29d2 diff --git a/trunk/drivers/scsi/ahci.c b/trunk/drivers/scsi/ahci.c index ee53b227c01e..eb7940aba400 100644 --- a/trunk/drivers/scsi/ahci.c +++ b/trunk/drivers/scsi/ahci.c @@ -39,7 +39,7 @@ #include #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); }