diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-07 03:10:05 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-07 03:14:04 -0500 |
commit | 8afd0ef2639ea2b7bc1b3a0f927ab14e0df034df (patch) | |
tree | 24d6abbf96e64b54b1e5aec882bd57b1a9bdd2a2 /sound/soc | |
parent | 98869f68f2f68a9f238f5e96dbc3f838a0ff7136 (diff) |
ASoC: wm8994: Fix variable double use
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm8994.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 82411009d401..f2e63acb2674 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
@@ -3721,7 +3721,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) | |||
3721 | { | 3721 | { |
3722 | struct wm8994_priv *wm8994 = data; | 3722 | struct wm8994_priv *wm8994 = data; |
3723 | struct snd_soc_codec *codec = wm8994->hubs.codec; | 3723 | struct snd_soc_codec *codec = wm8994->hubs.codec; |
3724 | int reg, count; | 3724 | int reg, count, ret; |
3725 | 3725 | ||
3726 | /* | 3726 | /* |
3727 | * Jack detection may have detected a removal simulataneously | 3727 | * Jack detection may have detected a removal simulataneously |
@@ -3767,11 +3767,11 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) | |||
3767 | 3767 | ||
3768 | /* Avoid a transient report when the accessory is being removed */ | 3768 | /* Avoid a transient report when the accessory is being removed */ |
3769 | if (wm8994->jackdet) { | 3769 | if (wm8994->jackdet) { |
3770 | reg = snd_soc_read(codec, WM1811_JACKDET_CTRL); | 3770 | ret = snd_soc_read(codec, WM1811_JACKDET_CTRL); |
3771 | if (reg < 0) { | 3771 | if (ret < 0) { |
3772 | dev_err(codec->dev, "Failed to read jack status: %d\n", | 3772 | dev_err(codec->dev, "Failed to read jack status: %d\n", |
3773 | reg); | 3773 | ret); |
3774 | } else if (!(reg & WM1811_JACKDET_LVL)) { | 3774 | } else if (!(ret & WM1811_JACKDET_LVL)) { |
3775 | dev_dbg(codec->dev, "Ignoring removed jack\n"); | 3775 | dev_dbg(codec->dev, "Ignoring removed jack\n"); |
3776 | return IRQ_HANDLED; | 3776 | return IRQ_HANDLED; |
3777 | } | 3777 | } |