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

81467c33 · Mark Brown · d7174db6 · 17665ca4 · 81467c33
Commit 81467c33 authored Dec 02, 2012 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

sound/soc/soc-jack.c sound/soc/soc-jack.c +0 -3

No files found.
--- 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;