diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-29 13:40:55 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-29 13:40:55 -0400 |
| commit | 60529c65ec3bc1a347f67eec1b1567efebbf7ce1 (patch) | |
| tree | b0306d615dc7fa791030fd8348706ed66c3c08d8 /sound/soc/soc-pcm.c | |
| parent | 5d99d778495cb02eafd38292f462c4466fc7189f (diff) | |
| parent | 5f6e7d52c4959019d12a7deebbde548884a917d1 (diff) | |
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) | |||
| 411 | } else { | 411 | } else { |
| 412 | /* start delayed pop wq here for playback streams */ | 412 | /* start delayed pop wq here for playback streams */ |
| 413 | rtd->pop_wait = 1; | 413 | rtd->pop_wait = 1; |
| 414 | schedule_delayed_work(&rtd->delayed_work, | 414 | queue_delayed_work(system_power_efficient_wq, |
| 415 | msecs_to_jiffies(rtd->pmdown_time)); | 415 | &rtd->delayed_work, |
| 416 | msecs_to_jiffies(rtd->pmdown_time)); | ||
| 416 | } | 417 | } |
| 417 | } else { | 418 | } else { |
| 418 | /* capture streams can be powered down now */ | 419 | /* capture streams can be powered down now */ |