diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-03 23:30:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-03 23:30:36 +0100 |
| commit | 20ed0938bfb132638f68618ba2e694aafe24d3e2 (patch) | |
| tree | 938d33049fe8158d02d6d81b44986a5cf421359c /sound/soc/mid-x86 | |
| parent | e1a02066080da55026c193603c7468c2d95d14a9 (diff) | |
| parent | 9ab88434e8b5ffc5a638b5b1d3b9a67dceb28e5d (diff) | |
| download | talos-obmc-linux-20ed0938bfb132638f68618ba2e694aafe24d3e2.tar.gz talos-obmc-linux-20ed0938bfb132638f68618ba2e694aafe24d3e2.zip | |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound/soc/mid-x86')
| -rw-r--r-- | sound/soc/mid-x86/sst_platform.c | 6 |
1 files changed, 6 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) |
