Module Name: src Committed By: bouyer Date: Thu Sep 26 08:16:26 UTC 2019
Modified Files: src/sys/dev/i2c: ihidev.c Log Message: Abort attach if acpi_intr_establish() fails. From K. Schreiner on current-users@. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/i2c/ihidev.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/ihidev.c diff -u src/sys/dev/i2c/ihidev.c:1.7 src/sys/dev/i2c/ihidev.c:1.8 --- src/sys/dev/i2c/ihidev.c:1.7 Fri Nov 16 23:05:50 2018 +++ src/sys/dev/i2c/ihidev.c Thu Sep 26 08:16:26 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ihidev.c,v 1.7 2018/11/16 23:05:50 jmcneill Exp $ */ +/* $NetBSD: ihidev.c,v 1.8 2019/09/26 08:16:26 bouyer Exp $ */ /* $OpenBSD ihidev.c,v 1.13 2017/04/08 02:57:23 deraadt Exp $ */ /*- @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.7 2018/11/16 23:05:50 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.8 2019/09/26 08:16:26 bouyer Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -210,8 +210,10 @@ ihidev_attach(device_t parent, device_t sc->sc_ih = acpi_intr_establish(self, sc->sc_phandle, IPL_TTY, false, ihidev_intr, sc, device_xname(self)); - if (sc->sc_ih == NULL) + if (sc->sc_ih == NULL) { aprint_error_dev(self, "can't establish interrupt\n"); + return; + } aprint_normal_dev(self, "interrupting at %s\n", acpi_intr_string(sc->sc_ih, buf, sizeof(buf))); }