aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-08-02 04:08:54 -0400
committerTakashi Iwai <tiwai@suse.de>2011-08-02 04:08:54 -0400
commit9f3b24948f22e4e21e961bd514c2089d24f0938e (patch)
treeb8e1cfad421abb4102ae9a975aa10d9e9e716f89 /sound
parent08f984c7f7f569b66acbbd163676b4bc7f64addc (diff)
parent06132fdf63c7d9acc19f136623bf2201f49e73b5 (diff)
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/txx9/txx9aclc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index 34aa972669e..3de99af8cb8 100644
--- a/sound/soc/txx9/txx9aclc.c
+++ b/sound/soc/txx9/txx9aclc.c
@@ -290,6 +290,7 @@ static void txx9aclc_pcm_free_dma_buffers(struct snd_pcm *pcm)
290 290
291static int txx9aclc_pcm_new(struct snd_soc_pcm_runtime *rtd) 291static int txx9aclc_pcm_new(struct snd_soc_pcm_runtime *rtd)
292{ 292{
293 struct snd_card *card = rtd->card->snd_card;
293 struct snd_soc_dai *dai = rtd->cpu_dai; 294 struct snd_soc_dai *dai = rtd->cpu_dai;
294 struct snd_pcm *pcm = rtd->pcm; 295 struct snd_pcm *pcm = rtd->pcm;
295 struct platform_device *pdev = to_platform_device(dai->platform->dev); 296 struct platform_device *pdev = to_platform_device(dai->platform->dev);