Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic Don't unregister sensors twice.



details:   https://anonhg.NetBSD.org/src/rev/943fda8bc735
branches:  trunk
changeset: 368219:943fda8bc735
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Wed Jun 29 15:58:12 2022 +0000

description:
Don't unregister sensors twice.

diffstat:

 sys/dev/ic/apple_smc_fan.c  |  5 ++---
 sys/dev/ic/apple_smc_temp.c |  5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r c06d17745fb9 -r 943fda8bc735 sys/dev/ic/apple_smc_fan.c
--- a/sys/dev/ic/apple_smc_fan.c        Wed Jun 29 15:56:58 2022 +0000
+++ b/sys/dev/ic/apple_smc_fan.c        Wed Jun 29 15:58:12 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apple_smc_fan.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $       */
+/*     $NetBSD: apple_smc_fan.c,v 1.6 2022/06/29 15:58:12 mlelstv Exp $        */
 
 /*
  * Apple System Management Controller: Fans
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apple_smc_fan.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apple_smc_fan.c,v 1.6 2022/06/29 15:58:12 mlelstv Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -218,7 +218,6 @@
        /* If we registered with sysmon_envsys, unregister.  */
        if (sc->sc_sme != NULL) {
                sysmon_envsys_unregister(sc->sc_sme);
-               sc->sc_sme = NULL;
 
                KASSERT(sc->sc_fans != NULL);
                KASSERT(sc->sc_nfans > 0);
diff -r c06d17745fb9 -r 943fda8bc735 sys/dev/ic/apple_smc_temp.c
--- a/sys/dev/ic/apple_smc_temp.c       Wed Jun 29 15:56:58 2022 +0000
+++ b/sys/dev/ic/apple_smc_temp.c       Wed Jun 29 15:58:12 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apple_smc_temp.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $      */
+/*     $NetBSD: apple_smc_temp.c,v 1.6 2022/06/29 15:58:12 mlelstv Exp $       */
 
 /*
  * Apple System Management Controller: Temperature Sensors
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apple_smc_temp.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apple_smc_temp.c,v 1.6 2022/06/29 15:58:12 mlelstv Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -153,7 +153,6 @@
        /* If we registered with sysmon_envsys, unregister.  */
        if (sc->sc_sme != NULL) {
                sysmon_envsys_unregister(sc->sc_sme);
-               sc->sc_sme = NULL;
 
                KASSERT(sc->sc_sensors != NULL);
                KASSERT(sc->sc_nsensors > 0);



Home | Main Index | Thread Index | Old Index