Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ic revert accidental commit.
details: https://anonhg.NetBSD.org/src/rev/7eb97e668077
branches: trunk
changeset: 368751:7eb97e668077
user: mlelstv <mlelstv%NetBSD.org@localhost>
date: Mon Aug 01 14:43:15 2022 +0000
description:
revert accidental commit.
diffstat:
sys/dev/ic/nslm7x.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diffs (45 lines):
diff -r 4e590e169b6b -r 7eb97e668077 sys/dev/ic/nslm7x.c
--- a/sys/dev/ic/nslm7x.c Mon Aug 01 14:34:01 2022 +0000
+++ b/sys/dev/ic/nslm7x.c Mon Aug 01 14:43:15 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.75 2022/08/01 07:34:28 mlelstv Exp $ */
+/* $NetBSD: nslm7x.c,v 1.76 2022/08/01 14:43:15 mlelstv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.75 2022/08/01 07:34:28 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.76 2022/08/01 14:43:15 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2247,7 +2247,6 @@
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;
@@ -2271,7 +2270,6 @@
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,
@@ -2287,9 +2285,7 @@
{
callout_halt(&lmsc->sc_callout, NULL);
callout_destroy(&lmsc->sc_callout);
-
- if (lmsc->sc_sme != NULL)
- sysmon_envsys_unregister(lmsc->sc_sme);
+ sysmon_envsys_unregister(lmsc->sc_sme);
pmf_device_deregister(lmsc->sc_dev);
}
Home |
Main Index |
Thread Index |
Old Index