---

yaml --- r: 372047 b: refs/heads/master c: 19133d2 h: refs/heads/master i: 372045: 0d0dd95 372043: 80694cc 372039: dc7717c 372031: 6290a07 v: v3
git-mirror · Apr 23, 2013 · b65e3ed · b65e3ed
1 parent bbaa3e0
commit b65e3ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8956908bf03418d7264de79e1e988628183f537
+refs/heads/master: 19133d2cfd9d6ad8365d94137dcd3e18f760c8e2
diff --git a/trunk/sound/soc/soc-generic-dmaengine-pcm.c b/trunk/sound/soc/soc-generic-dmaengine-pcm.c
@@ -227,7 +227,7 @@ static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
 		return;
 
 	if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) {
-		pcm->chan[0] = of_dma_request_slave_channel(of_node, "tx_rx");
+		pcm->chan[0] = of_dma_request_slave_channel(of_node, "rx-tx");
 		pcm->chan[1] = pcm->chan[0];
 	} else {
 		for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {