diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-25 23:57:35 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-04 00:03:56 +0200 |
| commit | acaf24f015b2bdd34032188d26c3092d6ca749b3 (patch) | |
| tree | a76fb19434f5f378052d101971129d1bea7ab6ca /sound/soc/soc-jack.c | |
| parent | ASoC: omap-abe-twl6040: Add device tree support (diff) | |
| download | linux-acaf24f015b2bdd34032188d26c3092d6ca749b3.tar.xz linux-acaf24f015b2bdd34032188d26c3092d6ca749b3.zip | |
ASoC: jack: Always update jack state even for noop changes
Now that DAPM is very cheap for most updates we've no need to avoid trying
to run it so always notify even if we don't think there are any changes.
This avoids potential issues with bootstrapping state like the pin state
or other notifiers when there's nothing in the jack.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/soc-jack.c')
| -rw-r--r-- | sound/soc/soc-jack.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 7f8b3b7428bb..2ca3c734a288 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -83,11 +83,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) jack->status &= ~mask; jack->status |= status & mask; - /* The DAPM sync is expensive enough to be worth skipping. - * However, empty mask means pin synchronization is desired. */ - if (mask && (jack->status == oldstatus)) - goto out; - trace_snd_soc_jack_notify(jack, status); list_for_each_entry(pin, &jack->pins, list) { @@ -109,7 +104,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) snd_jack_report(jack->jack, jack->status); -out: mutex_unlock(&jack->mutex); } EXPORT_SYMBOL_GPL(snd_soc_jack_report); |