d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix LOR #174.

Browse Source 
Tested with:	WITNESS, INVARIANTS and DIAGNOSTICS
This commit is contained in:
Ariff Abdullah 2005-12-31 01:58:40 +00:00
parent 93d9fd1136
commit c3ebbcbdf8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=153921
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/sound/pcm/dsp.c
View File

@ -248,11 +248,12 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td)
/* got a channel, already locked for us */
if (chn_reset(rdch, fmt)) {
pcm_chnrelease(rdch);
pcm_lock(d);
i_dev->si_drv1 = NULL;
pcm_unlock(d);
return ENODEV;
}
pcm_lock(d);
if (flags & O_NONBLOCK)
rdch->flags |= CHN_F_NBIO;
pcm_chnref(rdch, 1);
@ -261,6 +262,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td)
/*
* Record channel created, ref'ed and unlocked
*/
pcm_lock(d);
}
if (flags & FWRITE) {
@ -274,14 +276,15 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td)
else if (chn_reset(wrch, fmt))
error = ENODEV;
pcm_lock(d);
if (error != 0) {
if (wrch) {
/*
* Free play channel
*/
pcm_chnrelease(wrch);
pcm_lock(d);
i_dev->si_drv2 = NULL;
pcm_unlock(d);
}
if (rdref) {
/*
@ -290,10 +293,11 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td)
CHN_LOCK(rdch);
pcm_chnref(rdch, -1);
pcm_chnrelease(rdch);
pcm_lock(d);
i_dev->si_drv1 = NULL;
pcm_unlock(d);
}
pcm_unlock(d);
return error;
}
@ -301,6 +305,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td)
wrch->flags |= CHN_F_NBIO;
pcm_chnref(wrch, 1);
CHN_UNLOCK(wrch);
pcm_lock(d);
}
i_dev->si_drv1 = rdch;
@ -318,8 +323,10 @@ dsp_close(struct cdev *i_dev, int flags, int mode, struct thread *td)
int refs;
d = dsp_get_info(i_dev);
pcm_lock(d);
rdch = i_dev->si_drv1;
wrch = i_dev->si_drv2;
pcm_unlock(d);
refs = 0;