]> xenbits.xensource.com Git - linux-pvops.git/commitdiff
ASoC: Fix reporting of partial jack updates
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 4 Sep 2011 15:18:18 +0000 (08:18 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 7 Nov 2011 20:32:01 +0000 (12:32 -0800)
commit 747da0f80e566500421bd7760b2e050fea3fde5e upstream.

We need to report the entire jack state to the core jack code, not just
the bits that were being updated by the caller, otherwise the status
reported by other detection methods will be omitted from the state seen
by userspace.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sound/soc/soc-jack.c

index 1d455ab79490a70fdb0833638205a387ecccb8aa..840790813b3fb1ab08c9cd4683b5493ed8b0c46f 100644 (file)
@@ -94,7 +94,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 
        snd_soc_dapm_sync(codec);
 
-       snd_jack_report(jack->jack, status);
+       snd_jack_report(jack->jack, jack->status);
 
 out:
        mutex_unlock(&codec->mutex);