From b7f301a61ec4bc155d7f27a17f13393ff792b03d Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 10 Dec 2012 00:22:11 +0900 Subject: [PATCH] --- yaml --- r: 342926 b: refs/heads/master c: 2766ee82b28947b1411363e6cc471e1338090e99 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-jack.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6f709380c6b5..5f635e096a03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8df6bf1c58f397f8383b99a6003bbc4f721f080f +refs/heads/master: 2766ee82b28947b1411363e6cc471e1338090e99 diff --git a/trunk/sound/soc/soc-jack.c b/trunk/sound/soc/soc-jack.c index 1ab5fe04bfcc..e41e14c9565e 100644 --- a/trunk/sound/soc/soc-jack.c +++ b/trunk/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;