Merge tag 'xtensa-next-20121008' of git://github.com/czankel/xtensa-linux

[firefly-linux-kernel-4.4.55.git] / sound / soc / soc-jack.c

diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 7f8b3b7428bbf12c60f603fff8fbb8d3989fa254..fa0fd8ddae90fc17f280543c9399741c9a33038b 100644 (file)
--- 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) {
@@ -103,13 +98,12 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
        }
 
        /* Report before the DAPM sync to help users updating micbias status */
-       blocking_notifier_call_chain(&jack->notifier, status, jack);
+       blocking_notifier_call_chain(&jack->notifier, jack->status, jack);
 
        snd_soc_dapm_sync(dapm);
 
        snd_jack_report(jack->jack, jack->status);
 
-out:
        mutex_unlock(&jack->mutex);
 }
 EXPORT_SYMBOL_GPL(snd_soc_jack_report);