Merge remote-tracking branch 'asoc/topic/jack' into asoc-next

git-mirror · Dec 9, 2012 · 2766ee8 · 2766ee8
2 parents 8df6bf1 + 17665ca
commit 2766ee8
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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)
 	struct snd_soc_dapm_context *dapm;
 	struct snd_soc_jack_pin *pin;
 	int enable;
-	int oldstatus;
 
 	trace_snd_soc_jack_report(jack, mask, status);
 
@@ -78,8 +77,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 
 	mutex_lock(&jack->mutex);
 
-	oldstatus = jack->status;
-
 	jack->status &= ~mask;
 	jack->status |= status & mask;