Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/i2c ihidev(4): Prohibit closing an unopened ihidev.



details:   https://anonhg.NetBSD.org/src/rev/e2c80c60e582
branches:  trunk
changeset: 359627:e2c80c60e582
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Jan 14 22:28:59 2022 +0000

description:
ihidev(4): Prohibit closing an unopened ihidev.

diffstat:

 sys/dev/i2c/ihidev.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 57248f792162 -r e2c80c60e582 sys/dev/i2c/ihidev.c
--- a/sys/dev/i2c/ihidev.c      Fri Jan 14 22:28:50 2022 +0000
+++ b/sys/dev/i2c/ihidev.c      Fri Jan 14 22:28:59 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ihidev.c,v 1.25 2022/01/14 22:28:50 riastradh Exp $ */
+/* $NetBSD: ihidev.c,v 1.26 2022/01/14 22:28:59 riastradh 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.25 2022/01/14 22:28:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.26 2022/01/14 22:28:59 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -919,10 +919,10 @@
 
        mutex_enter(&sc->sc_lock);
 
-       /* XXX make this an assertion */
-       if (!(scd->sc_state & IHIDEV_OPEN))
-               goto out;
-
+       KASSERTMSG(scd->sc_state & IHIDEV_OPEN,
+           "%s: closing %s when not open",
+           device_xname(scd->sc_idev),
+           device_xname(sc->sc_dev));
        scd->sc_state &= ~IHIDEV_OPEN;
 
        if (--sc->sc_refcnt)



Home | Main Index | Thread Index | Old Index