Restore order of interrupt setup. Minor problems can result by

setting up the interrupts too early:

Reviewed by: mav@
Sponsored by: Netflix

2 files changed, 9 insertions, 7 deletions

diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
index 95ce61f..61be530 100644
--- a/sys/dev/ahci/ahci.c
+++ b/sys/dev/ahci/ahci.c
@@ -229,6 +229,15 @@ ahci_attach(device_t dev)
 
 	ahci_ctlr_setup(dev);
 
+	/* Setup interrupts. */
+	if (ahci_setup_interrupt(dev)) {
+		bus_dma_tag_destroy(ctlr->dma_tag);
+		bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid,
+		    ctlr->r_mem);
+		rman_fini(&ctlr->sc_iomem);
+		return ENXIO;
+	}
+
 	i = 0;
 	for (u = ctlr->ichannels; u != 0; u >>= 1)
 		i += (u & 1);
diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c
index e9a0d75..6572e4c 100644
--- a/sys/dev/ahci/ahci_pci.c
+++ b/sys/dev/ahci/ahci_pci.c
@@ -417,13 +417,6 @@ ahci_pci_attach(device_t dev)
 		ctlr->numirqs = 1;
 	}
 
-	if (ahci_setup_interrupt(dev)) {
-		if (ctlr->msi)
-			pci_release_msi(dev);
-		bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem);
-		return ENXIO;
-	}
-
 	error = ahci_attach(dev);
 	if (error != 0)
 		if (ctlr->msi)