diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:30 +0100 |
| commit | e7ac4fb607a365300ce7b68f68ded63fd1f3ecfa (patch) | |
| tree | 0be92cd7a1cb4bbd32799582f39a3f52c9adb56f /sound | |
| parent | b8e58d4e2ea82ee3ded5d10bc62850932d4f0d31 (diff) | |
| parent | 3d24cfe485e2750cc209a77dd62fa1fe004fc6c7 (diff) | |
| download | op-kernel-dev-e7ac4fb607a365300ce7b68f68ded63fd1f3ecfa.zip op-kernel-dev-e7ac4fb607a365300ce7b68f68ded63fd1f3ecfa.tar.gz | |
Merge remote-tracking branch 'asoc/topic/compress' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-compress.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 06a8000a..53c9ecd 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -149,8 +149,9 @@ static int soc_compr_free(struct snd_compr_stream *cstream) SND_SOC_DAPM_STREAM_STOP); } else { rtd->pop_wait = 1; - schedule_delayed_work(&rtd->delayed_work, - msecs_to_jiffies(rtd->pmdown_time)); + queue_delayed_work(system_power_efficient_wq, + &rtd->delayed_work, + msecs_to_jiffies(rtd->pmdown_time)); } } else { /* capture streams can be powered down now */ @@ -334,7 +335,7 @@ static int soc_compr_copy(struct snd_compr_stream *cstream, return ret; } -static int sst_compr_set_metadata(struct snd_compr_stream *cstream, +static int soc_compr_set_metadata(struct snd_compr_stream *cstream, struct snd_compr_metadata *metadata) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; @@ -347,7 +348,7 @@ static int sst_compr_set_metadata(struct snd_compr_stream *cstream, return ret; } -static int sst_compr_get_metadata(struct snd_compr_stream *cstream, +static int soc_compr_get_metadata(struct snd_compr_stream *cstream, struct snd_compr_metadata *metadata) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; @@ -364,8 +365,8 @@ static struct snd_compr_ops soc_compr_ops = { .open = soc_compr_open, .free = soc_compr_free, .set_params = soc_compr_set_params, - .set_metadata = sst_compr_set_metadata, - .get_metadata = sst_compr_get_metadata, + .set_metadata = soc_compr_set_metadata, + .get_metadata = soc_compr_get_metadata, .get_params = soc_compr_get_params, .trigger = soc_compr_trigger, .pointer = soc_compr_pointer, |
