diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-21 15:37:34 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-22 10:29:02 +0200 |
| commit | 30a765d6433413c0eba90c969eecf12dfa2d111a (patch) | |
| tree | 63c8ad1b2420212668552790f39700ef168474a0 | |
| parent | ASoC: dapm: Run clock and regulator events separately to other supplies (diff) | |
| download | linux-30a765d6433413c0eba90c969eecf12dfa2d111a.tar.xz linux-30a765d6433413c0eba90c969eecf12dfa2d111a.zip | |
ASoC: dont call dapm_sync while reporting jack always
While reporting the jack status snd_soc_jack_report() invokes snd_soc_dapm_sync()
always. This should be required when we have pins associated with jack and
reporting enables or disables these.
So add a check for this case
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to '')
| -rw-r--r-- | sound/soc/soc-jack.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 71358e3b54d9..23d43dac91da 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -65,6 +65,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) struct snd_soc_codec *codec; struct snd_soc_dapm_context *dapm; struct snd_soc_jack_pin *pin; + unsigned int sync = 0; int enable; trace_snd_soc_jack_report(jack, mask, status); @@ -92,12 +93,16 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) snd_soc_dapm_enable_pin(dapm, pin->pin); else snd_soc_dapm_disable_pin(dapm, pin->pin); + + /* we need to sync for this case only */ + sync = 1; } /* Report before the DAPM sync to help users updating micbias status */ blocking_notifier_call_chain(&jack->notifier, jack->status, jack); - snd_soc_dapm_sync(dapm); + if (sync) + snd_soc_dapm_sync(dapm); snd_jack_report(jack->jack, jack->status); |