Module Name: src
Committed By: uwe
Date: Wed Oct 6 23:58:49 UTC 2021
Modified Files:
src/sys/arch/i386/pnpbios: wss_pnpbios.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/pnpbios/wss_pnpbios.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/arch/i386/pnpbios/wss_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.24 src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.25
--- src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.24 Sat Aug 7 16:18:55 2021
+++ src/sys/arch/i386/pnpbios/wss_pnpbios.c Wed Oct 6 23:58:49 2021
@@ -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 @@ wss_pnpbios_attach(device_t parent, devi
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"));
}
