diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-12 11:05:44 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-16 19:14:52 +0000 |
| commit | 96dd362284ddcb546d2783035ae7eeda73692eda (patch) | |
| tree | 441df60fa2d47cfb05d9e3ccc52d6a0282952e1d /sound/soc/soc-core.c | |
| parent | 3a66d3877eaa4ab9818000a15c07326adaa9ca79 (diff) | |
| download | kernel_goldelico_gta04-96dd362284ddcb546d2783035ae7eeda73692eda.zip kernel_goldelico_gta04-96dd362284ddcb546d2783035ae7eeda73692eda.tar.gz kernel_goldelico_gta04-96dd362284ddcb546d2783035ae7eeda73692eda.tar.bz2 | |
ASoC: Make pmdown_time a per-card setting
Make the pmdown_time a per-card setting rather than a global one,
initialised before the card initialisation runs. This allows cards
to override the default setting if it makes sense to do so (for
example, due to an unavoidable pop).
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ca89c78..94b9cde 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -542,7 +542,7 @@ static int soc_codec_close(struct snd_pcm_substream *substream) /* start delayed pop wq here for playback streams */ codec_dai->pop_wait = 1; schedule_delayed_work(&card->delayed_work, - msecs_to_jiffies(pmdown_time)); + msecs_to_jiffies(card->pmdown_time)); } else { /* capture streams can be powered down now */ snd_soc_dapm_stream_event(codec, @@ -1039,6 +1039,8 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) dev_dbg(card->dev, "All components present, instantiating\n"); /* Found everything, bring it up */ + card->pmdown_time = pmdown_time; + if (card->probe) { ret = card->probe(pdev); if (ret < 0) |