diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-08 20:10:56 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 10:42:55 +0000 |
| commit | b5d1d036eadb30996184cc335c798219dd5922a9 (patch) | |
| tree | 5e720760cf7f180e46fd6b4c804da38b99bf7f39 /sound/soc/soc-pcm.c | |
| parent | 4c6c0b5eee572a24345fdd1fac6aa670cc937a3a (diff) | |
| download | linux-b5d1d036eadb30996184cc335c798219dd5922a9.tar.bz2 | |
ASoC: pcm: If pmdown_time is zero then shut down DAPM immediately
Since we've already got logic to special case immediate teardown of the
stream we may as well use it if the pmdown_time has been set to zero by
the application layer instead of scheduling a work item with zero delay.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 121318defea3..15816eccad34 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -369,7 +369,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) cpu_dai->runtime = NULL; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - if (codec->ignore_pmdown_time || + if (!rtd->pmdown_time || codec->ignore_pmdown_time || rtd->dai_link->ignore_pmdown_time) { /* powered down playback stream now */ snd_soc_dapm_stream_event(rtd, |