]> git.karo-electronics.de Git - karo-tx-linux.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, 3 Oct 2011 18:40:26 +0000 (11:40 -0700)
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 38b00131b2fe20cf395b70197a650d4e2e35e679..fa31d9c2abd8fe29c615f24f64b68f33bb33004f 100644 (file)
@@ -105,7 +105,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 
        snd_soc_dapm_sync(dapm);
 
-       snd_jack_report(jack->jack, status);
+       snd_jack_report(jack->jack, jack->status);
 
 out:
        mutex_unlock(&codec->mutex);