D52493.1784359470.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D52493.1784359470.diff
View Options

	diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
	--- a/sys/dev/sound/pcm/channel.h
	+++ b/sys/dev/sound/pcm/channel.h
	@@ -408,7 +408,7 @@

	#define CHN_F_RESET (CHN_F_BUSY \| CHN_F_DEAD \| \
	CHN_F_VIRTUAL \| CHN_F_HAS_VCHAN \| \
	- CHN_F_VCHAN_DYNAMIC \| \
	+ CHN_F_VCHAN_DYNAMIC \| CHN_F_NBIO \| \
	CHN_F_PASSTHROUGH \| CHN_F_EXCLUSIVE)

	#define CHN_F_MMAP_INVALID (CHN_F_DEAD \| CHN_F_RUNNING)
	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
	@@ -299,7 +299,7 @@
	CHN_LOCK(rdch);
	chn_abort(rdch); /* won't sleep */
	rdch->flags &= ~(CHN_F_RUNNING \| CHN_F_MMAP \|
	- CHN_F_DEAD \| CHN_F_EXCLUSIVE);
	+ CHN_F_DEAD \| CHN_F_EXCLUSIVE \| CHN_F_NBIO);
	chn_reset(rdch, 0, 0);
	chn_release(rdch);
	if (rdch->flags & CHN_F_VIRTUAL) {
	@@ -323,7 +323,7 @@
	CHN_LOCK(wrch);
	chn_flush(wrch); /* may sleep */
	wrch->flags &= ~(CHN_F_RUNNING \| CHN_F_MMAP \|
	- CHN_F_DEAD \| CHN_F_EXCLUSIVE);
	+ CHN_F_DEAD \| CHN_F_EXCLUSIVE \| CHN_F_NBIO);
	chn_reset(wrch, 0, 0);
	chn_release(wrch);
	if (wrch->flags & CHN_F_VIRTUAL) {