diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 12:17:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 12:17:14 +0200 |
| commit | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch) | |
| tree | 51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /sound/soc/soc-pcm.c | |
| parent | Linux 3.11 (diff) | |
| parent | ASoC: atmel: disable error interrupt (diff) | |
| download | linux-29dc5dd229dc3130b51df0932e59946fc09d3bd4.tar.xz linux-29dc5dd229dc3130b51df0932e59946fc09d3bd4.zip | |
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index b6c640332a17..fb70fbe26862 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -411,8 +411,9 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) } else { /* start delayed pop wq here for playback streams */ 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 */ @@ -1832,18 +1833,10 @@ static int dpcm_run_old_update(struct snd_soc_pcm_runtime *fe, int stream) /* Called by DAPM mixer/mux changes to update audio routing between PCMs and * any DAI links. */ -int soc_dpcm_runtime_update(struct snd_soc_dapm_widget *widget) +int soc_dpcm_runtime_update(struct snd_soc_card *card) { - struct snd_soc_card *card; int i, old, new, paths; - if (widget->codec) - card = widget->codec->card; - else if (widget->platform) - card = widget->platform->card; - else - return -EINVAL; - mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_RUNTIME); for (i = 0; i < card->num_rtd; i++) { struct snd_soc_dapm_widget_list *list; |