From 6e42e955e46f9f2d5ea30aa77f2f44e3779fb4fa Mon Sep 17 00:00:00 2001 From: mlelstv Date: Mon, 1 Aug 2022 14:44:15 +0000 Subject: Prevent multiple unregistrations. --- sys/dev/ic/nslm7x.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'sys/dev/ic') diff --git a/sys/dev/ic/nslm7x.c b/sys/dev/ic/nslm7x.c index 1748c7008af..892011456b5 100644 --- a/sys/dev/ic/nslm7x.c +++ b/sys/dev/ic/nslm7x.c @@ -1,4 +1,4 @@ -/* $NetBSD: nslm7x.c,v 1.76 2022/08/01 14:43:15 mlelstv Exp $ */ +/* $NetBSD: nslm7x.c,v 1.77 2022/08/01 14:44:15 mlelstv Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.76 2022/08/01 14:43:15 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.77 2022/08/01 14:44:15 mlelstv Exp $"); #include #include @@ -2247,6 +2247,7 @@ lm_attach(struct lm_softc *lmsc) if ((rv = sysmon_envsys_sensor_attach(lmsc->sc_sme, &lmsc->sensors[i])) != 0) { sysmon_envsys_destroy(lmsc->sc_sme); + lmsc->sc_sme = NULL; aprint_error_dev(lmsc->sc_dev, "sysmon_envsys_sensor_attach() returned %d\n", rv); return; @@ -2270,6 +2271,7 @@ lm_attach(struct lm_softc *lmsc) aprint_error_dev(lmsc->sc_dev, "unable to register with sysmon\n"); sysmon_envsys_destroy(lmsc->sc_sme); + lmsc->sc_sme = NULL; } if (!pmf_device_register(lmsc->sc_dev, NULL, NULL)) aprint_error_dev(lmsc->sc_dev, @@ -2285,7 +2287,9 @@ lm_detach(struct lm_softc *lmsc) { callout_halt(&lmsc->sc_callout, NULL); callout_destroy(&lmsc->sc_callout); - sysmon_envsys_unregister(lmsc->sc_sme); + + if (lmsc->sc_sme != NULL) + sysmon_envsys_unregister(lmsc->sc_sme); pmf_device_deregister(lmsc->sc_dev); } -- cgit