diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-07-29 18:40:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-29 18:40:55 +0100 |
| commit | 60529c65ec3bc1a347f67eec1b1567efebbf7ce1 (patch) | |
| tree | b0306d615dc7fa791030fd8348706ed66c3c08d8 /sound/soc/soc-pcm.c | |
| parent | ASoC: tlv320aic3x: Use snd_soc_dapm_mixer_update_power (diff) | |
| parent | ASoC: Remove unused dapm_get_snd_card() and dapm_get_soc_card() (diff) | |
| download | wireguard-linux-60529c65ec3bc1a347f67eec1b1567efebbf7ce1.tar.xz wireguard-linux-60529c65ec3bc1a347f67eec1b1567efebbf7ce1.zip | |
Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dapm
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 5c2c66209808..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 */ |