Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/i386/pnpbios Fix KASSERT triggered when attaching o...



details:   https://anonhg.NetBSD.org/src/rev/2ff7b767b46f
branches:  trunk
changeset: 1023998:2ff7b767b46f
user:      uwe <uwe%NetBSD.org@localhost>
date:      Wed Oct 06 23:58:49 2021 +0000

description:
Fix KASSERT triggered when attaching opl at wss@pnpbios

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/arch/i386/pnpbios/wss_pnpbios.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 9e4818583ad2 -r 2ff7b767b46f sys/arch/i386/pnpbios/wss_pnpbios.c
--- a/sys/arch/i386/pnpbios/wss_pnpbios.c       Wed Oct 06 20:42:44 2021 +0000
+++ b/sys/arch/i386/pnpbios/wss_pnpbios.c       Wed Oct 06 23:58:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_pnpbios.c,v 1.24 2021/08/07 16:18:55 thorpej Exp $ */
+/* $NetBSD: wss_pnpbios.c,v 1.25 2021/10/06 23:58:49 uwe Exp $ */
 /*
  * Copyright (c) 1999
  *     Matthias Drochner.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_pnpbios.c,v 1.24 2021/08/07 16:18:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_pnpbios.c,v 1.25 2021/10/06 23:58:49 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -168,6 +168,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