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++) {