Module Name: src
Committed By: jdc
Date: Sat Oct 31 13:17:34 UTC 2020
Modified Files:
src/sys/arch/sparc64/dev: pcf8591_envctrl.c tda.c
Log Message:
Call sysmon_envsys_unregister() not sysmon_envsys_destroy() when
detaching. Pointed out by Michael van Elst.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/dev/pcf8591_envctrl.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc64/dev/tda.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/sparc64/dev/pcf8591_envctrl.c
diff -u src/sys/arch/sparc64/dev/pcf8591_envctrl.c:1.10 src/sys/arch/sparc64/dev/pcf8591_envctrl.c:1.11
--- src/sys/arch/sparc64/dev/pcf8591_envctrl.c:1.10 Sat Oct 24 15:16:39 2020
+++ src/sys/arch/sparc64/dev/pcf8591_envctrl.c Sat Oct 31 13:17:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8591_envctrl.c,v 1.10 2020/10/24 15:16:39 jdc Exp $ */
+/* $NetBSD: pcf8591_envctrl.c,v 1.11 2020/10/31 13:17:34 jdc Exp $ */
/* $OpenBSD: pcf8591_envctrl.c,v 1.6 2007/10/25 21:17:20 kettenis Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcf8591_envctrl.c,v 1.10 2020/10/24 15:16:39 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcf8591_envctrl.c,v 1.11 2020/10/31 13:17:34 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -264,7 +264,7 @@ ecadc_detach(device_t self, int flags)
}
if (sc->sc_sme != NULL)
- sysmon_envsys_destroy(sc->sc_sme);
+ sysmon_envsys_unregister(sc->sc_sme);
return 0;
}
Index: src/sys/arch/sparc64/dev/tda.c
diff -u src/sys/arch/sparc64/dev/tda.c:1.13 src/sys/arch/sparc64/dev/tda.c:1.14
--- src/sys/arch/sparc64/dev/tda.c:1.13 Fri Mar 1 02:38:17 2019
+++ src/sys/arch/sparc64/dev/tda.c Sat Oct 31 13:17:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tda.c,v 1.13 2019/03/01 02:38:17 mrg Exp $ */
+/* $NetBSD: tda.c,v 1.14 2020/10/31 13:17:34 jdc Exp $ */
/* $OpenBSD: tda.c,v 1.4 2008/02/27 17:25:00 robert Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tda.c,v 1.13 2019/03/01 02:38:17 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tda.c,v 1.14 2020/10/31 13:17:34 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -177,7 +177,7 @@ tda_detach(device_t self, int flags)
struct tda_softc *sc = device_private(self);
if (sc->sc_sme != NULL)
- sysmon_envsys_destroy(sc->sc_sme);
+ sysmon_envsys_unregister(sc->sc_sme);
callout_halt(&sc->sc_timer, NULL);
callout_destroy(&sc->sc_timer);
