From 4b88a9af4c3784a824f7480e1c8ceeab4e61e588 Mon Sep 17 00:00:00 2001 From: Troy Kisky Date: Sat, 4 Jul 2009 19:29:56 -0700 Subject: [PATCH] --- yaml --- r: 157541 b: refs/heads/master c: 9333b594a08f2b2d8b7d96260164817acdbc5cab h: refs/heads/master i: 157539: 8ca3eec745840d3d0803de8ab8f4a292cbeb55e1 v: v3 --- [refs] | 2 +- trunk/sound/soc/davinci/davinci-i2s.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 194c86c40ab6..8e8aac58586e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bef449989d0866a7db366a8153135cfa3d5cad9 +refs/heads/master: 9333b594a08f2b2d8b7d96260164817acdbc5cab diff --git a/trunk/sound/soc/davinci/davinci-i2s.c b/trunk/sound/soc/davinci/davinci-i2s.c index 42609654b5e3..5b31b56e2e92 100644 --- a/trunk/sound/soc/davinci/davinci-i2s.c +++ b/trunk/sound/soc/davinci/davinci-i2s.c @@ -210,14 +210,10 @@ static void davinci_mcbsp_stop(struct davinci_mcbsp_dev *dev, int playback) } static int davinci_i2s_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) + struct snd_soc_dai *cpu_dai) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; - struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data; - + struct davinci_mcbsp_dev *dev = cpu_dai->private_data; cpu_dai->dma_data = dev->dma_params[substream->stream]; - return 0; }