aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-04 08:18:18 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-03 11:40:26 -0700
commitb549d496e8739577429bbdfde5470097bff2f2f5 (patch)
tree65f0af6541671b163203057c862e29df29249fb3 /sound
parentc4a67651296888f4c91f5dbd394a279b8b4410fd (diff)
downloadkernel_samsung_crespo-b549d496e8739577429bbdfde5470097bff2f2f5.zip
kernel_samsung_crespo-b549d496e8739577429bbdfde5470097bff2f2f5.tar.gz
kernel_samsung_crespo-b549d496e8739577429bbdfde5470097bff2f2f5.tar.bz2
ASoC: Fix reporting of partial jack updates
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-jack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 38b0013..fa31d9c 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -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);