D60513.1793831100.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D60513.1793831100.diff
View Options

	diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
	--- a/sys/dev/sound/pcm/dsp.c
	+++ b/sys/dev/sound/pcm/dsp.c
	@@ -267,7 +267,6 @@
	PCM_GIANT_ENTER(d);

	PCM_ACQUIRE(d);
	- PCM_LOCK(d);

	rdch = priv->rdch;
	wrch = priv->wrch;
	@@ -277,8 +276,6 @@
	if (wrch != NULL)
	CHN_REMOVE(d, wrch, channels.pcm.opened);

	- PCM_UNLOCK(d);
	-
	if (rdch != NULL) {
	/*
	* The channel itself need not be locked because:
	@@ -377,9 +374,7 @@

	PCM_GIANT_ENTER(d);

	- /* Lock snddev so nobody else can monkey with it. */
	PCM_ACQUIRE(d);
	- PCM_LOCK(d);

	error = 0;
	if (!DSP_F_VALID(flags))
	@@ -418,7 +413,6 @@
	error = ENOTSUP;
	}
	}
	- PCM_UNLOCK(d);

	if (error != 0) {
	PCM_RELEASE(d);
	@@ -433,9 +427,7 @@
	PCM_GIANT_EXIT(d);
	return (error);
	}
	- PCM_LOCK(d);
	CHN_INSERT_HEAD(d, priv->wrch, channels.pcm.opened);
	- PCM_UNLOCK(d);
	}
	if (DSP_F_READ(flags)) {
	error = dsp_chn_alloc(d, &priv->rdch, PCMDIR_REC, flags, td);
	@@ -444,9 +436,7 @@
	PCM_GIANT_EXIT(d);
	return (error);
	}
	- PCM_LOCK(d);
	CHN_INSERT_HEAD(d, priv->rdch, channels.pcm.opened);
	- PCM_UNLOCK(d);
	}

	PCM_RELEASE(d);