summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-10-10 04:49:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-10-10 04:49:27 +0000
commit29e527d288ae70e161ddb8d09e8993198cd6224d (patch)
treeb88a755beffc5259e09c93f1812def5e8a4009a0
parent4e1ab84c499f49891ef64950a6f7544ac5a8cc92 (diff)
Again, in detatch... call whatever disconnects our interrupt, before we
go messing with the maps. Only affects my disconnectable em(4).
-rw-r--r--sys/dev/pci/if_em.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index fc1c324a76d..9a596e43694 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-/* $OpenBSD: if_em.c,v 1.224 2009/10/09 21:04:03 deraadt Exp $ */
+/* $OpenBSD: if_em.c,v 1.225 2009/10/10 04:49:26 deraadt Exp $ */
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
#include <dev/pci/if_em.h>
@@ -1763,9 +1763,9 @@ em_detach(struct device *self, int flags)
timeout_del(&sc->timer_handle);
timeout_del(&sc->tx_fifo_timer_handle);
+ em_free_pci_resources(sc);
em_dma_free(sc, &sc->rxdma);
em_dma_free(sc, &sc->txdma);
- em_free_pci_resources(sc);
ether_ifdetach(ifp);
if_detach(ifp);