Module Name: src Committed By: riastradh Date: Tue Apr 18 06:37:25 UTC 2023
Modified Files: src/sys/dev/isapnp: sb_isapnp.c src/sys/dev/ofisa: sb_ofisa.c Log Message: sb(4): Fix missing mutex initialization at isapnp and ofisa. PR kern/57363 XXX pullup-8 XXX pullup-9 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/dev/isapnp/sb_isapnp.c cvs rdiff -u -r1.23 -r1.24 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.53 src/sys/dev/isapnp/sb_isapnp.c:1.54 --- src/sys/dev/isapnp/sb_isapnp.c:1.53 Wed May 8 13:40:18 2019 +++ src/sys/dev/isapnp/sb_isapnp.c Tue Apr 18 06:37:25 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: sb_isapnp.c,v 1.53 2019/05/08 13:40:18 isaki Exp $ */ +/* $NetBSD: sb_isapnp.c,v 1.54 2023/04/18 06:37:25 riastradh 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.53 2019/05/08 13:40:18 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.54 2023/04/18 06:37:25 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -158,6 +158,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.23 src/sys/dev/ofisa/sb_ofisa.c:1.24 --- src/sys/dev/ofisa/sb_ofisa.c:1.23 Wed Jan 27 03:10:21 2021 +++ src/sys/dev/ofisa/sb_ofisa.c Tue Apr 18 06:37:25 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: sb_ofisa.c,v 1.23 2021/01/27 03:10:21 thorpej Exp $ */ +/* $NetBSD: sb_ofisa.c,v 1.24 2023/04/18 06:37:25 riastradh 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.23 2021/01/27 03:10:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.24 2023/04/18 06:37:25 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -170,6 +170,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);