Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't unregister envsys when not registered.

This commit is contained in:
mlelstv 2023-12-11 13:30:33 +00:00
parent 82249e7b1d
commit 35ca8e8840
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/onewire/owtemp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: owtemp.c,v 1.21 2023/10/10 19:21:38 kardel Exp $ */ /* $NetBSD: owtemp.c,v 1.22 2023/12/11 13:30:33 mlelstv Exp $ */
/* $OpenBSD: owtemp.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */ /* $OpenBSD: owtemp.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*- /*-
@ -51,7 +51,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.21 2023/10/10 19:21:38 kardel Exp $"); __KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.22 2023/12/11 13:30:33 mlelstv Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -161,6 +161,7 @@ owtemp_attach(device_t parent, device_t self, void *aux)
"%s S/N %012" PRIx64, sc->sc_chipname, ONEWIRE_ROM_SN(sc->sc_rom)); "%s S/N %012" PRIx64, sc->sc_chipname, ONEWIRE_ROM_SN(sc->sc_rom));
if (sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_sensor)) { if (sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_sensor)) {
sysmon_envsys_destroy(sc->sc_sme); sysmon_envsys_destroy(sc->sc_sme);
sc->sc_sme = NULL;
return; return;
} }
@ -172,6 +173,7 @@ owtemp_attach(device_t parent, device_t self, void *aux)
if (sysmon_envsys_register(sc->sc_sme)) { if (sysmon_envsys_register(sc->sc_sme)) {
aprint_error_dev(self, "unable to register with sysmon\n"); aprint_error_dev(self, "unable to register with sysmon\n");
sysmon_envsys_destroy(sc->sc_sme); sysmon_envsys_destroy(sc->sc_sme);
sc->sc_sme = NULL;
return; return;
} }
@ -183,6 +185,7 @@ owtemp_detach(device_t self, int flags)
{ {
struct owtemp_softc *sc = device_private(self); struct owtemp_softc *sc = device_private(self);
if (sc->sc_sme != NULL)
sysmon_envsys_unregister(sc->sc_sme); sysmon_envsys_unregister(sc->sc_sme);
evcnt_detach(&sc->sc_ev_rsterr); evcnt_detach(&sc->sc_ev_rsterr);
evcnt_detach(&sc->sc_ev_update); evcnt_detach(&sc->sc_ev_update);