diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-17 04:05:46 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-17 04:05:46 -0500 |
| commit | d78930f42247ceacd83a7f1c0ca37ab2e0a3fd5b (patch) | |
| tree | f1ccac45dc180cd1d333423bd07d5b86befbd336 /sound/soc/mid-x86 | |
| parent | 00c651612ef2b4b6b953059ace6b50afcb8d88c4 (diff) | |
| parent | c45471eac2bdc271df40963ac8448d76ac434872 (diff) | |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into for-3.3
Diffstat (limited to 'sound/soc/mid-x86')
| -rw-r--r-- | sound/soc/mid-x86/sst_platform.c | 1 |
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) | |||
| 267 | { | 267 | { |
| 268 | struct snd_pcm_runtime *runtime = substream->runtime; | 268 | struct snd_pcm_runtime *runtime = substream->runtime; |
| 269 | struct sst_runtime_stream *stream; | 269 | struct sst_runtime_stream *stream; |
| 270 | int ret_val; | ||
| 270 | 271 | ||
| 271 | pr_debug("sst_platform_open called\n"); | 272 | pr_debug("sst_platform_open called\n"); |
| 272 | 273 | ||