Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19357366 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Do not allow multiple streams in one direction 



Make sure that the user can not start multiple streams with the same
direction.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5f9a50c3

sound/soc/davinci/davinci-mcasp.c

+6 −2
Original line number Diff line number Diff line
@@ -1230,11 +1230,15 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream, 
	int i, dir;

	int tdm_slots = mcasp->tdm_slots;



	if (mcasp->tdm_mask[substream->stream])

		tdm_slots = hweight32(mcasp->tdm_mask[substream->stream]);

	/* Do not allow more then one stream per direction */

	if (mcasp->substreams[substream->stream])

		return -EBUSY;



	mcasp->substreams[substream->stream] = substream;



	if (mcasp->tdm_mask[substream->stream])

		tdm_slots = hweight32(mcasp->tdm_mask[substream->stream]);



	if (mcasp->op_mode == DAVINCI_MCASP_DIT_MODE)

		return 0;