From: Lars-Peter Clausen <lars@metafoo.de>
Date: Mon, 22 Mar 2010 15:22:26 +0000 (+0000)
Subject: sound jz4740_pcm: Don't request dma channel mor then once.
X-Git-Tag: reboot~20540
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fd3344d4881b33c108bccc22a3eb8623adcb8008;p=openwrt%2Fstaging%2Fblogic.git

sound jz4740_pcm: Don't request dma channel mor then once.

It is possible that the hw_params callback is called multiple times when using
the oss emulation layer. Thus we need to check whether the dma channel has
already been requested otherwise we'll end up with all dma channels being
requested by sound driver.

SVN-Revision: 20369
---

diff --git a/target/linux/xburst/files-2.6.32/sound/soc/jz4740/jz4740-pcm.c b/target/linux/xburst/files-2.6.32/sound/soc/jz4740/jz4740-pcm.c
index c71c5b48b555..4a4de195a879 100644
--- a/target/linux/xburst/files-2.6.32/sound/soc/jz4740/jz4740-pcm.c
+++ b/target/linux/xburst/files-2.6.32/sound/soc/jz4740/jz4740-pcm.c
@@ -105,10 +105,11 @@ static int jz4740_pcm_hw_params(struct snd_pcm_substream *substream,
 	struct jz4740_pcm_config *config;
 
 	config = rtd->dai->cpu_dai->dma_data;
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		prtd->dma = jz4740_dma_request(substream, "PCM Playback");
-	} else {
-		prtd->dma = jz4740_dma_request(substream, "PCM Capture");
+	if (!prtd->dma) {
+		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+			prtd->dma = jz4740_dma_request(substream, "PCM Playback");
+		else
+			prtd->dma = jz4740_dma_request(substream, "PCM Capture");
 	}
 
 	if (!prtd->dma)