summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2009-10-10 04:49:26 +0000
committerderaadt <deraadt@openbsd.org>2009-10-10 04:49:26 +0000
commitf7ad78f68f3f44a131bebf2509dda166314b16f4 (patch)
tree48eb8a81364787d8be2bdbb05aa3fa762707b848 /sys/dev
parentMust also timeout_del twice in detach()... (diff)
downloadwireguard-openbsd-f7ad78f68f3f44a131bebf2509dda166314b16f4.tar.xz
wireguard-openbsd-f7ad78f68f3f44a131bebf2509dda166314b16f4.zip
Again, in detatch... call whatever disconnects our interrupt, before we
go messing with the maps. Only affects my disconnectable em(4).
Diffstat (limited to 'sys/dev')
-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);