diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-08-07 03:24:13 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-07 10:09:58 -0400 |
commit | 5f800080ca6840326b3048202fb63fc4a71a4c49 (patch) | |
tree | 75bd9ee0d98d57e4b0f61193d1e3077215b95fe9 /sound/soc/soc-core.c | |
parent | 209ffe19ff98f5c0133bd98a689fc4fb42202de3 (diff) |
ASoC: core: Set dapm->idle_bias_off for DAIs not mapped with a codec
The idle_bias_off flag is not configured for DAIs not mapped with a codec.
This causes the pm counter to be increased at probe time for the CPU dai
which unbalances the pm counter handling.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f81c5976b961..f10f00b5d29f 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -3715,6 +3715,9 @@ int snd_soc_register_dai(struct device *dev, | |||
3715 | } | 3715 | } |
3716 | } | 3716 | } |
3717 | 3717 | ||
3718 | if (!dai->codec) | ||
3719 | dai->dapm.idle_bias_off = 1; | ||
3720 | |||
3718 | list_add(&dai->list, &dai_list); | 3721 | list_add(&dai->list, &dai_list); |
3719 | 3722 | ||
3720 | mutex_unlock(&client_mutex); | 3723 | mutex_unlock(&client_mutex); |
@@ -3803,6 +3806,9 @@ int snd_soc_register_dais(struct device *dev, | |||
3803 | } | 3806 | } |
3804 | } | 3807 | } |
3805 | 3808 | ||
3809 | if (!dai->codec) | ||
3810 | dai->dapm.idle_bias_off = 1; | ||
3811 | |||
3806 | list_add(&dai->list, &dai_list); | 3812 | list_add(&dai->list, &dai_list); |
3807 | 3813 | ||
3808 | mutex_unlock(&client_mutex); | 3814 | mutex_unlock(&client_mutex); |