From 2aec83aee78893a807731939e8a60269632abbde Mon Sep 17 00:00:00 2001 From: Lu Guanqun Date: Tue, 6 Sep 2011 15:21:38 +0800 Subject: [PATCH] --- yaml --- r: 270568 b: refs/heads/master c: 22be504aaa4a3133d81e3fb0c4287960aea19c37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/mid-x86/sst_platform.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a2e1aaaa5b79..e99015bb05f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2f6fce33ed6146d0442b6ad8c8b827f507d3aec +refs/heads/master: 22be504aaa4a3133d81e3fb0c4287960aea19c37 diff --git a/trunk/sound/soc/mid-x86/sst_platform.c b/trunk/sound/soc/mid-x86/sst_platform.c index d99f2535dc4c..af666ae671ae 100644 --- a/trunk/sound/soc/mid-x86/sst_platform.c +++ b/trunk/sound/soc/mid-x86/sst_platform.c @@ -226,13 +226,14 @@ static int sst_platform_init_stream(struct snd_pcm_substream *substream) static int sst_platform_open(struct snd_pcm_substream *substream) { - struct snd_pcm_runtime *runtime; + struct snd_pcm_runtime *runtime = substream->runtime; struct sst_runtime_stream *stream; int ret_val = 0; pr_debug("sst_platform_open called\n"); - runtime = substream->runtime; - runtime->hw = sst_platform_pcm_hw; + + snd_soc_set_runtime_hwparams(substream, &sst_platform_pcm_hw); + stream = kzalloc(sizeof(*stream), GFP_KERNEL); if (!stream) return -ENOMEM;