From b65e3ed3489574d806eb898c0a9cdc0490011382 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Mon, 22 Apr 2013 21:48:45 +0800
Subject: [PATCH] --- yaml --- r: 372047 b: refs/heads/master c:
 19133d2cfd9d6ad8365d94137dcd3e18f760c8e2 h: refs/heads/master i:   372045:
 0d0dd95ad1eb7dfad6c678b80e8a298a62b153e7   372043:
 80694cc8b6ab76875fdd5f886bfeac2f936b3fa0   372039:
 dc7717c77004925903930b9f6b5b9bd0203ea839   372031:
 6290a07c0dfdb47849a79fcf20768fafd4a20f7b v: v3

---
 [refs]                                      | 2 +-
 trunk/sound/soc/soc-generic-dmaengine-pcm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1c3ce7db1fd2..c080d9353549 100644
--- 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
index 5fd5ed4c0a96..98e131037fd8 100644
--- 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++) {