diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:11 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:11 +0900 |
| commit | 2766ee82b28947b1411363e6cc471e1338090e99 (patch) | |
| tree | b4e4aa0c135ee1b53d91ab306500cc0a0badabfe | |
| parent | 8df6bf1c58f397f8383b99a6003bbc4f721f080f (diff) | |
| parent | 17665ca4412e796b934b7b28bf6525b2849b5fd5 (diff) | |
| download | linux-2766ee82b28947b1411363e6cc471e1338090e99.tar.gz linux-2766ee82b28947b1411363e6cc471e1338090e99.tar.bz2 linux-2766ee82b28947b1411363e6cc471e1338090e99.zip | |
Merge remote-tracking branch 'asoc/topic/jack' into asoc-next
| -rw-r--r-- | sound/soc/soc-jack.c | 3 |
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) 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; |