| commit | 81467c332579df104c2f863aca48d5390b9079cd | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sun Dec 02 13:35:06 2012 +0900 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sun Dec 02 13:35:06 2012 +0900 |
| tree | 7b45569e9b24f74228ee33bd339aa2124d017ed4 | |
| parent | d7174db6d1459a5154a9209b3cc7761aaa41cb2a [diff] | |
| parent | 17665ca4412e796b934b7b28bf6525b2849b5fd5 [diff] |
Merge remote-tracking branch 'asoc/topic/jack' into asoc-next
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 1ab5fe0..e41e14c 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c
@@ -66,7 +66,6 @@ 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 @@ mutex_lock(&jack->mutex); - oldstatus = jack->status; - jack->status &= ~mask; jack->status |= status & mask;