svn commit: r264939 - stable/9/sys/dev/aac

[Marius Strobl]

Author: marius
Date: Fri Apr 25 21:24:53 2014
New Revision: 264939
URL: http://svnweb.freebsd.org/changeset/base/264939

Log:
  MFC: r260044
  
  Free the MSI again on detach if allocated. Arguably, this code would be
  better off living in aac_pci.c, but it doesn't seem worth creating a
  aac_pci_detach() and it's also not the first PCI-specific bit in aac.c

Modified:
  stable/9/sys/dev/aac/aac.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/aac/aac.c
==============================================================================
--- stable/9/sys/dev/aac/aac.c	Fri Apr 25 21:24:33 2014	(r264938)
+++ stable/9/sys/dev/aac/aac.c	Fri Apr 25 21:24:53 2014	(r264939)
@@ -631,9 +631,11 @@ aac_free(struct aac_softc *sc)
 	/* disconnect the interrupt handler */
 	if (sc->aac_intr)
 		bus_teardown_intr(sc->aac_dev, sc->aac_irq, sc->aac_intr);
-	if (sc->aac_irq != NULL)
+	if (sc->aac_irq != NULL) {
 		bus_release_resource(sc->aac_dev, SYS_RES_IRQ,
 		    rman_get_rid(sc->aac_irq), sc->aac_irq);
+		pci_release_msi(sc->aac_dev);
+	}
 
 	/* destroy data-transfer DMA tag */
 	if (sc->aac_buffer_dmat)