Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/isapnp Fix KASSERT triggered when attaching opl at w...



details:   https://anonhg.NetBSD.org/src/rev/3388ed212df6
branches:  trunk
changeset: 988282:3388ed212df6
user:      uwe <uwe%NetBSD.org@localhost>
date:      Thu Oct 07 00:01:45 2021 +0000

description:
Fix KASSERT triggered when attaching opl at wss@isapnp.

Not really tested (no h/w), but this problem is exhibited by the
congruent code in acpi and pnpbios attachments.

wss has two attributes, "wss" and "audiobus", and this call didn't
specify an iattr for opl to attach to.  config_search_internal asserts
that when no iattr is specified, the parent should only have one.

diffstat:

 sys/dev/isapnp/wss_isapnp.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 962eaa8b6cdd -r 3388ed212df6 sys/dev/isapnp/wss_isapnp.c
--- a/sys/dev/isapnp/wss_isapnp.c       Wed Oct 06 23:58:49 2021 +0000
+++ b/sys/dev/isapnp/wss_isapnp.c       Thu Oct 07 00:01:45 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wss_isapnp.c,v 1.30 2021/08/07 16:19:12 thorpej Exp $  */
+/*     $NetBSD: wss_isapnp.c,v 1.31 2021/10/07 00:01:45 uwe Exp $      */
 
 /*
  * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.30 2021/08/07 16:19:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.31 2021/10/07 00:01:45 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -174,6 +174,6 @@
                arg.type = AUDIODEV_TYPE_OPL;
                arg.hwif = 0;
                arg.hdl = 0;
-               (void)config_found(self, &arg, audioprint, CFARGS_NONE);
+               config_found(self, &arg, audioprint, CFARGS(.iattr = "wss"));
        }
 }



Home | Main Index | Thread Index | Old Index