| From 71720968f183e74a1c94f4d6eb8238ba1854e17e Mon Sep 17 00:00:00 2001 |
| From: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Date: Sun, 4 Sep 2011 08:18:18 -0700 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c |
| index 3c07a94..f097755 100644 |
| --- a/sound/soc/soc-jack.c |
| +++ b/sound/soc/soc-jack.c |
| @@ -95,7 +95,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); |
| -- |
| 1.7.12.rc1.1.gbce1580 |
| |
