aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-jack.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-06 08:30:55 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-06 11:18:39 -0400
commit143d62a45b5f976067a8d705f7fae26a402651f9 (patch)
tree4e82b4051aeca52dafca1d68477133f29d08354a /sound/soc/soc-jack.c
parentc4671a95857800941cb5aa6405170f3a91e448b4 (diff)
ASoC: Ensure DAPM widgets are set up before we sync jacks
We synchronise jack state on startup - when we do that make sure that we have set up all the DAPM widgets first in case we end up touching any of the partially set up widgets when syncing the jack pins. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Diffstat (limited to 'sound/soc/soc-jack.c')
-rw-r--r--sound/soc/soc-jack.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index fa31d9c2abd8..52db96636290 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -188,6 +188,8 @@ int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
188 list_add(&(pins[i].list), &jack->pins); 188 list_add(&(pins[i].list), &jack->pins);
189 } 189 }
190 190
191 snd_soc_dapm_new_widgets(&jack->codec->card->dapm);
192
191 /* Update to reflect the last reported status; canned jack 193 /* Update to reflect the last reported status; canned jack
192 * implementations are likely to set their state before the 194 * implementations are likely to set their state before the
193 * card has an opportunity to associate pins. 195 * card has an opportunity to associate pins.