diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-12 17:19:08 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-12 17:19:08 -0500 |
| commit | e951f7e85de428bcbbe8034cd353e17799baa35b (patch) | |
| tree | 62b4bc4430ae17f8810bf7d7ec802a21403d6c0d /sound | |
| parent | 6be1cbfb784b508947de2c7b0fb2ba4afb163aca (diff) | |
| parent | 8afd0ef2639ea2b7bc1b3a0f927ab14e0df034df (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
Diffstat (limited to 'sound')
| -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 3b269fa226bd..c9bd445c4976 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
| @@ -3737,7 +3737,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) | |||
| 3737 | { | 3737 | { |
| 3738 | struct wm8994_priv *wm8994 = data; | 3738 | struct wm8994_priv *wm8994 = data; |
| 3739 | struct snd_soc_codec *codec = wm8994->hubs.codec; | 3739 | struct snd_soc_codec *codec = wm8994->hubs.codec; |
| 3740 | int reg, count; | 3740 | int reg, count, ret; |
| 3741 | 3741 | ||
| 3742 | /* | 3742 | /* |
| 3743 | * Jack detection may have detected a removal simulataneously | 3743 | * Jack detection may have detected a removal simulataneously |
| @@ -3783,11 +3783,11 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) | |||
| 3783 | 3783 | ||
| 3784 | /* Avoid a transient report when the accessory is being removed */ | 3784 | /* Avoid a transient report when the accessory is being removed */ |
| 3785 | if (wm8994->jackdet) { | 3785 | if (wm8994->jackdet) { |
| 3786 | reg = snd_soc_read(codec, WM1811_JACKDET_CTRL); | 3786 | ret = snd_soc_read(codec, WM1811_JACKDET_CTRL); |
| 3787 | if (reg < 0) { | 3787 | if (ret < 0) { |
| 3788 | dev_err(codec->dev, "Failed to read jack status: %d\n", | 3788 | dev_err(codec->dev, "Failed to read jack status: %d\n", |
| 3789 | reg); | 3789 | ret); |
| 3790 | } else if (!(reg & WM1811_JACKDET_LVL)) { | 3790 | } else if (!(ret & WM1811_JACKDET_LVL)) { |
| 3791 | dev_dbg(codec->dev, "Ignoring removed jack\n"); | 3791 | dev_dbg(codec->dev, "Ignoring removed jack\n"); |
| 3792 | return IRQ_HANDLED; | 3792 | return IRQ_HANDLED; |
| 3793 | } | 3793 | } |