diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-06 14:30:55 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-06 17:18:39 +0200 |
| commit | 143d62a45b5f976067a8d705f7fae26a402651f9 (patch) | |
| tree | 4e82b4051aeca52dafca1d68477133f29d08354a /sound | |
| parent | ASoC: Replace remaining use of *_volsw_2r with *_volsw (diff) | |
| download | linux-143d62a45b5f976067a8d705f7fae26a402651f9.tar.xz linux-143d62a45b5f976067a8d705f7fae26a402651f9.zip | |
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')
| -rw-r--r-- | sound/soc/soc-jack.c | 2 |
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, list_add(&(pins[i].list), &jack->pins); } + snd_soc_dapm_new_widgets(&jack->codec->card->dapm); + /* Update to reflect the last reported status; canned jack * implementations are likely to set their state before the * card has an opportunity to associate pins. |