diff options
| author | Mark Brown | 2011-05-03 23:30:36 +0100 |
|---|---|---|
| committer | Mark Brown | 2011-05-03 23:30:36 +0100 |
| commit | 20ed0938bfb132638f68618ba2e694aafe24d3e2 (patch) | |
| tree | 938d33049fe8158d02d6d81b44986a5cf421359c | |
| parent | e1a02066080da55026c193603c7468c2d95d14a9 (diff) | |
| parent | 9ab88434e8b5ffc5a638b5b1d3b9a67dceb28e5d (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
| -rw-r--r-- | sound/soc/mid-x86/sst_platform.c | 6 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
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, return 0; } +static int sst_platform_pcm_hw_free(struct snd_pcm_substream *substream) +{ + return snd_pcm_lib_free_pages(substream); +} + static struct snd_pcm_ops sst_platform_ops = { .open = sst_platform_open, .close = sst_platform_close, @@ -388,6 +393,7 @@ static struct snd_pcm_ops sst_platform_ops = { .trigger = sst_platform_pcm_trigger, .pointer = sst_platform_pcm_pointer, .hw_params = sst_platform_pcm_hw_params, + .hw_free = sst_platform_pcm_hw_free, }; static 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) if (!card->name || !card->dev) return -EINVAL; + dev_set_drvdata(card->dev, card); + snd_soc_initialize_card_lists(card); soc_init_card_debugfs(card); |