Module Name: src
Committed By: skrll
Date: Thu Nov 26 12:53:03 UTC 2020
Modified Files:
src/sys/dev/i2c: g760a.c
Log Message:
Fix build and improve error handling
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/i2c/g760a.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/g760a.c
diff -u src/sys/dev/i2c/g760a.c:1.5 src/sys/dev/i2c/g760a.c:1.6
--- src/sys/dev/i2c/g760a.c:1.5 Sat Jun 16 21:22:13 2018
+++ src/sys/dev/i2c/g760a.c Thu Nov 26 12:53:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: g760a.c,v 1.5 2018/06/16 21:22:13 thorpej Exp $ */
+/* $NetBSD: g760a.c,v 1.6 2020/11/26 12:53:03 skrll Exp $ */
/*-
* Copyright (C) 2008 A.Leo.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g760a.c,v 1.5 2018/06/16 21:22:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g760a.c,v 1.6 2020/11/26 12:53:03 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,6 +227,8 @@ g760a_setup(struct g760a_softc* sc)
CTLTYPE_NODE, device_xname(sc->sc_dev), NULL,
NULL, 0, NULL, 0,
CTL_MACHDEP, CTL_CREATE, CTL_EOL);
+ if (ret)
+ goto sysctl_failed;
(void)strlcpy(sc->sc_sensor.desc, "sysfan rpm",
sizeof(sc->sc_sensor.desc));
@@ -242,6 +244,9 @@ g760a_setup(struct g760a_softc* sc)
sysctl_g760a_rpm, 0x42, (void*)sc, 0,
CTL_MACHDEP, me->sysctl_num, CTL_CREATE, CTL_EOL);
+ if (ret)
+ goto sysctl_failed;
+
sc->sc_sme->sme_name = device_xname(sc->sc_dev);
sc->sc_sme->sme_cookie = sc;
sc->sc_sme->sme_refresh = g760a_refresh;
@@ -255,6 +260,11 @@ g760a_setup(struct g760a_softc* sc)
}
return;
+
+sysctl_failed:
+ aprint_error_dev(sc->sc_dev,
+ "couldn't create sysctl nodes (%d)\n", ret);
+
out:
sysmon_envsys_destroy(sc->sc_sme);
}
