summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-08-02 10:08:54 +0200
committerTakashi Iwai <tiwai@suse.de>2011-08-02 10:08:54 +0200
commit9f3b24948f22e4e21e961bd514c2089d24f0938e (patch)
treeb8e1cfad421abb4102ae9a975aa10d9e9e716f89 /sound
parent08f984c7f7f569b66acbbd163676b4bc7f64addc (diff)
parent06132fdf63c7d9acc19f136623bf2201f49e73b5 (diff)
downloadop-kernel-dev-9f3b24948f22e4e21e961bd514c2089d24f0938e.zip
op-kernel-dev-9f3b24948f22e4e21e961bd514c2089d24f0938e.tar.gz
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 34aa972..3de99af 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)
static int txx9aclc_pcm_new(struct snd_soc_pcm_runtime *rtd)
{
+ struct snd_card *card = rtd->card->snd_card;
struct snd_soc_dai *dai = rtd->cpu_dai;
struct snd_pcm *pcm = rtd->pcm;
struct platform_device *pdev = to_platform_device(dai->platform->dev);
OpenPOWER on IntegriCloud