Module Name: src
Committed By: dyoung
Date: Tue Apr 7 21:00:31 UTC 2009
Modified Files:
src/sys/arch/x86/x86: ipmi.c
Log Message:
In ipmi_detach(), don't sysmon_envsys_destroy(), but just _unregister():
_unregister() calls _destroy().
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x86/x86/ipmi.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/x86/ipmi.c
diff -u src/sys/arch/x86/x86/ipmi.c:1.30 src/sys/arch/x86/x86/ipmi.c:1.31
--- src/sys/arch/x86/x86/ipmi.c:1.30 Tue Apr 7 17:53:45 2009
+++ src/sys/arch/x86/x86/ipmi.c Tue Apr 7 21:00:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.30 2009/04/07 17:53:45 dyoung Exp $ */
+/* $NetBSD: ipmi.c,v 1.31 2009/04/07 21:00:30 dyoung Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.30 2009/04/07 17:53:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.31 2009/04/07 21:00:30 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1881,10 +1881,9 @@
ipmi_enabled = 0;
- sysmon_envsys_unregister(sc->sc_envsys);
-
if (sc->sc_envsys != NULL) {
- sysmon_envsys_destroy(sc->sc_envsys);
+ /* _unregister also destroys */
+ sysmon_envsys_unregister(sc->sc_envsys);
sc->sc_envsys = NULL;
}
