aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 10:22:11 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 10:22:11 -0500
commit2766ee82b28947b1411363e6cc471e1338090e99 (patch)
treeb4e4aa0c135ee1b53d91ab306500cc0a0badabfe /sound/soc
parent8df6bf1c58f397f8383b99a6003bbc4f721f080f (diff)
parent17665ca4412e796b934b7b28bf6525b2849b5fd5 (diff)
Merge remote-tracking branch 'asoc/topic/jack' into asoc-next
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-jack.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 1ab5fe04bfcc..e41e14c9565e 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -66,7 +66,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
66 struct snd_soc_dapm_context *dapm; 66 struct snd_soc_dapm_context *dapm;
67 struct snd_soc_jack_pin *pin; 67 struct snd_soc_jack_pin *pin;
68 int enable; 68 int enable;
69 int oldstatus;
70 69
71 trace_snd_soc_jack_report(jack, mask, status); 70 trace_snd_soc_jack_report(jack, mask, status);
72 71
@@ -78,8 +77,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
78 77
79 mutex_lock(&jack->mutex); 78 mutex_lock(&jack->mutex);
80 79
81 oldstatus = jack->status;
82
83 jack->status &= ~mask; 80 jack->status &= ~mask;
84 jack->status |= status & mask; 81 jack->status |= status & mask;
85 82