From e61c9b68250666616655272e4522a91fa69982c8 Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Thu, 9 Oct 2008 15:57:21 +0300 Subject: [PATCH] --- yaml --- r: 113703 b: refs/heads/master c: 2e89713a8396ab07b9cccc83e50e55646c235342 h: refs/heads/master i: 113701: 4785be612f7808f8823d0587631471c0919540d9 113699: a0edac29310a3e4ef3c950b92e720245598b7ff8 113695: 1a5456a28f54ef77786b2e1db449080373cd1e25 v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/omap-mcbsp.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 33abc2ac7cbb..ad14714b7e37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 406e2c48cf716411c07aecf2a0e5331ae9521efe +refs/heads/master: 2e89713a8396ab07b9cccc83e50e55646c235342 diff --git a/trunk/sound/soc/omap/omap-mcbsp.c b/trunk/sound/soc/omap/omap-mcbsp.c index e97e6b28b8a7..0a063a98a661 100644 --- a/trunk/sound/soc/omap/omap-mcbsp.c +++ b/trunk/sound/soc/omap/omap-mcbsp.c @@ -59,12 +59,7 @@ static struct omap_mcbsp_data mcbsp_data[NUM_LINKS]; * Stream DMA parameters. DMA request line and port address are set runtime * since they are different between OMAP1 and later OMAPs */ -static struct omap_pcm_dma_data omap_mcbsp_dai_dma_params[NUM_LINKS][2] = { -{ - { .name = "I2S PCM Stereo out", }, - { .name = "I2S PCM Stereo in", }, -}, -}; +static struct omap_pcm_dma_data omap_mcbsp_dai_dma_params[NUM_LINKS][2]; #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) static const int omap1_dma_reqs[][2] = { @@ -222,6 +217,8 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, } else { return -ENODEV; } + omap_mcbsp_dai_dma_params[id][substream->stream].name = + substream->stream ? "Audio Capture" : "Audio Playback"; omap_mcbsp_dai_dma_params[id][substream->stream].dma_req = dma; omap_mcbsp_dai_dma_params[id][substream->stream].port_addr = port; cpu_dai->dma_data = &omap_mcbsp_dai_dma_params[id][substream->stream];