Module Name: src
Committed By: knakahara
Date: Wed Jan 29 08:43:30 UTC 2020
Modified Files:
src/sys/arch/x86/pci: if_vmx.c
Log Message:
Fix missing callout_destroy(). Pointed out by yamaguchi@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/x86/pci/if_vmx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/if_vmx.c
diff -u src/sys/arch/x86/pci/if_vmx.c:1.55 src/sys/arch/x86/pci/if_vmx.c:1.56
--- src/sys/arch/x86/pci/if_vmx.c:1.55 Wed Jan 29 02:58:51 2020
+++ src/sys/arch/x86/pci/if_vmx.c Wed Jan 29 08:43:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vmx.c,v 1.55 2020/01/29 02:58:51 knakahara Exp $ */
+/* $NetBSD: if_vmx.c,v 1.56 2020/01/29 08:43:30 knakahara Exp $ */
/* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.55 2020/01/29 02:58:51 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.56 2020/01/29 08:43:30 knakahara Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -667,6 +667,7 @@ vmxnet3_detach(device_t self, int flags)
VMXNET3_CORE_LOCK(sc);
vmxnet3_stop_locked(sc);
callout_halt(&sc->vmx_tick, sc->vmx_mtx);
+ callout_destroy(&sc->vmx_tick);
VMXNET3_CORE_UNLOCK(sc);
ifmedia_delete_instance(&sc->vmx_media, IFM_INST_ANY);
