summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormsaitoh <msaitoh@NetBSD.org>2022-09-14 01:05:42 +0000
committermsaitoh <msaitoh@NetBSD.org>2022-09-14 01:05:42 +0000
commiteba904eeceacc2aa4875ac5956e1c08fbd189943 (patch)
tree7d7498407ee490b26dfb1728b5439d2da2b92ecf /sys/dev
parent03750c83f7cdf357eb6b9b4f5a1c673e267f3f5d (diff)
mfii: Don't panic on detach.
Call sysmon_envsys_destroy() and clear sc->sc_sme to NULL if sysmon_envsys_register failed.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/mfii.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c
index 0885b957740..7dca48f1543 100644
--- a/sys/dev/pci/mfii.c
+++ b/sys/dev/pci/mfii.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.26 2022/07/16 07:23:51 msaitoh Exp $ */
+/* $NetBSD: mfii.c,v 1.27 2022/09/14 01:05:42 msaitoh Exp $ */
/* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.26 2022/07/16 07:23:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.27 2022/09/14 01:05:42 msaitoh Exp $");
#include "bio.h"
@@ -3982,6 +3982,8 @@ mfii_create_sensors(struct mfii_softc *sc)
if (rv) {
aprint_error_dev(sc->sc_dev,
"unable to register with sysmon (rv = %d)\n", rv);
+ sysmon_envsys_destroy(sc->sc_sme);
+ sc->sc_sme = NULL;
}
return rv;