summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-17 10:05:46 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-17 10:05:46 +0100
commitd78930f42247ceacd83a7f1c0ca37ab2e0a3fd5b (patch)
treef1ccac45dc180cd1d333423bd07d5b86befbd336 /sound
parentASoC: Staticise mfld_msic_dailink (diff)
parentASoC: Fix compile error in sound/soc/mid-x86/sst_platform.c (diff)
downloadlinux-d78930f42247ceacd83a7f1c0ca37ab2e0a3fd5b.tar.xz
linux-d78930f42247ceacd83a7f1c0ca37ab2e0a3fd5b.zip
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into for-3.3
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/mid-x86/sst_platform.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c
index 5b936d5029fe..c2bf172a196e 100644
--- a/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
@@ -267,6 +267,7 @@ static int sst_platform_open(struct snd_pcm_substream *substream)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct sst_runtime_stream *stream;
+ int ret_val;
pr_debug("sst_platform_open called\n");