diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-10-09 21:04:04 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-10-09 21:04:04 +0000 |
| commit | 4e1ab84c499f49891ef64950a6f7544ac5a8cc92 (patch) | |
| tree | 7c36ba0a90fc2bf7677fa25d44dc0bfa09387fa1 | |
| parent | f525aa18133c0ed3c4af447ce46e78ef516bb8ee (diff) | |
Must also timeout_del twice in detach()...
| -rw-r--r-- | sys/dev/pci/if_em.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 457b0014fca..fc1c324a76d 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.223 2009/10/09 20:50:32 deraadt Exp $ */ +/* $OpenBSD: if_em.c,v 1.224 2009/10/09 21:04:03 deraadt Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -1760,6 +1760,9 @@ em_detach(struct device *self, int flags) struct em_softc *sc = (struct em_softc *)self; struct ifnet *ifp = &sc->interface_data.ac_if; + timeout_del(&sc->timer_handle); + timeout_del(&sc->tx_fifo_timer_handle); + em_dma_free(sc, &sc->rxdma); em_dma_free(sc, &sc->txdma); em_free_pci_resources(sc); |