aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/mid-x86/sst_platform.c6
-rw-r--r--sound/soc/soc-core.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c
index 9765fb81a5e3..5a946b4115a2 100644
--- a/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
@@ -380,6 +380,11 @@ static int sst_platform_pcm_hw_params(struct snd_pcm_substream *substream,
380 return 0; 380 return 0;
381} 381}
382 382
383static int sst_platform_pcm_hw_free(struct snd_pcm_substream *substream)
384{
385 return snd_pcm_lib_free_pages(substream);
386}
387
383static struct snd_pcm_ops sst_platform_ops = { 388static struct snd_pcm_ops sst_platform_ops = {
384 .open = sst_platform_open, 389 .open = sst_platform_open,
385 .close = sst_platform_close, 390 .close = sst_platform_close,
@@ -388,6 +393,7 @@ static struct snd_pcm_ops sst_platform_ops = {
388 .trigger = sst_platform_pcm_trigger, 393 .trigger = sst_platform_pcm_trigger,
389 .pointer = sst_platform_pcm_pointer, 394 .pointer = sst_platform_pcm_pointer,
390 .hw_params = sst_platform_pcm_hw_params, 395 .hw_params = sst_platform_pcm_hw_params,
396 .hw_free = sst_platform_pcm_hw_free,
391}; 397};
392 398
393static void sst_pcm_free(struct snd_pcm *pcm) 399static void sst_pcm_free(struct snd_pcm *pcm)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index fbd011ebe19f..133edeb9728a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3356,6 +3356,8 @@ int snd_soc_register_card(struct snd_soc_card *card)
3356 if (!card->name || !card->dev) 3356 if (!card->name || !card->dev)
3357 return -EINVAL; 3357 return -EINVAL;
3358 3358
3359 dev_set_drvdata(card->dev, card);
3360
3359 snd_soc_initialize_card_lists(card); 3361 snd_soc_initialize_card_lists(card);
3360 3362
3361 soc_init_card_debugfs(card); 3363 soc_init_card_debugfs(card);