diff options
| author | scottl <scottl@FreeBSD.org> | 2003-11-11 05:38:28 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2003-11-11 05:38:28 +0000 |
| commit | b1f6b54a9b03a8c61b8ef229f3f4ba40905bcd45 (patch) | |
| tree | b489e6d70819d26baf14c77df12889db048aca11 /sys/dev/sound/pcm/mixer.c | |
| parent | cc852a80a31de8499d7cb796db663450b8fd1596 (diff) | |
| download | FreeBSD-src-b1f6b54a9b03a8c61b8ef229f3f4ba40905bcd45.zip FreeBSD-src-b1f6b54a9b03a8c61b8ef229f3f4ba40905bcd45.tar.gz | |
Fix sound LOR problems:
dsp_open: rearrange to only hold one lock at a time
dsp_close: ditto
mixer_hwvol_init: delete locking, the only consumer seems to
be the ess driver and it only call it a creation time, I
think the device will be stable across the sleepable malloc.
cmi interrupt routine: Release locks while caller chn_intr,
either this or do what emu10k1 does which is have no locks
at in the interrupt handler.
Submitted by: mat@cnd.mcgill.ca
Diffstat (limited to 'sys/dev/sound/pcm/mixer.c')
| -rw-r--r-- | sys/dev/sound/pcm/mixer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 6eb6117..1c89bb9 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -319,7 +319,6 @@ mixer_hwvol_init(device_t dev) pdev = mixer_get_devt(dev); m = pdev->si_drv1; - snd_mtxlock(m->lock); m->hwvol_mixer = SOUND_MIXER_VOLUME; m->hwvol_step = 5; @@ -330,7 +329,6 @@ mixer_hwvol_init(device_t dev) OID_AUTO, "hwvol_mixer", CTLTYPE_STRING | CTLFLAG_RW, m, 0, sysctl_hw_snd_hwvol_mixer, "A", ""); #endif - snd_mtxunlock(m->lock); return 0; } |
