CVS commit: [netbsd-8] src/sys/dev

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Tue Aug  1 15:01:56 UTC 2023

Modified Files:
        src/sys/dev/isapnp [netbsd-8]: sb_isapnp.c
        src/sys/dev/ofisa [netbsd-8]: sb_ofisa.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1870):

        sys/dev/isapnp/sb_isapnp.c: revision 1.54
        sys/dev/ofisa/sb_ofisa.c: revision 1.24

sb(4): Fix missing mutex initialization at isapnp and ofisa.
PR kern/57363


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.84.1 src/sys/dev/isapnp/sb_isapnp.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/dev/ofisa/sb_ofisa.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/isapnp/sb_isapnp.c
diff -u src/sys/dev/isapnp/sb_isapnp.c:1.52 src/sys/dev/isapnp/sb_isapnp.c:1.52.84.1
--- src/sys/dev/isapnp/sb_isapnp.c:1.52	Sat Mar 15 21:09:02 2008
+++ src/sys/dev/isapnp/sb_isapnp.c	Tue Aug  1 15:01:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: sb_isapnp.c,v 1.52 2008/03/15 21:09:02 cube Exp $	*/
+/*	$NetBSD: sb_isapnp.c,v 1.52.84.1 2023/08/01 15:01:55 martin Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.52 2008/03/15 21:09:02 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.52.84.1 2023/08/01 15:01:55 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -159,6 +159,9 @@ sb_isapnp_attach(device_t parent, device
 		return;
 	}
 
+	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
+	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
+
 	sc->sc_ih = isa_intr_establish(ipa->ipa_ic, ipa->ipa_irq[0].num,
 	    ipa->ipa_irq[0].type, IPL_AUDIO, sbdsp_intr, sc);
 

Index: src/sys/dev/ofisa/sb_ofisa.c
diff -u src/sys/dev/ofisa/sb_ofisa.c:1.18 src/sys/dev/ofisa/sb_ofisa.c:1.18.8.1
--- src/sys/dev/ofisa/sb_ofisa.c:1.18	Fri Dec  9 17:18:35 2016
+++ src/sys/dev/ofisa/sb_ofisa.c	Tue Aug  1 15:01:56 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: sb_ofisa.c,v 1.18 2016/12/09 17:18:35 christos Exp $	*/
+/*	$NetBSD: sb_ofisa.c,v 1.18.8.1 2023/08/01 15:01:56 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.18 2016/12/09 17:18:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.18.8.1 2023/08/01 15:01:56 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -175,6 +175,9 @@ sb_ofisa_attach(device_t parent, device_
 		return;
 	}
 
+	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
+	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
+
 	sc->sc_ih = isa_intr_establish(aa->ic, intr.irq, IST_EDGE, IPL_AUDIO,
 	    sbdsp_intr, sc);