projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
sound
/
soc
/
codecs
/
wm8994.c
diff --git
a/sound/soc/codecs/wm8994.c
b/sound/soc/codecs/wm8994.c
index 3b269fa226bdabec90e97c2b77bd8347909a9df7..c9bd445c497628d014a77508e8d37092e4db203e 100644
(file)
--- 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)
{
struct wm8994_priv *wm8994 = data;
struct snd_soc_codec *codec = wm8994->hubs.codec;
{
struct wm8994_priv *wm8994 = data;
struct snd_soc_codec *codec = wm8994->hubs.codec;
- int reg, count;
+ int reg, count
, ret
;
/*
* Jack detection may have detected a removal simulataneously
/*
* Jack detection may have detected a removal simulataneously
@@
-3783,11
+3783,11
@@
static irqreturn_t wm8958_mic_irq(int irq, void *data)
/* Avoid a transient report when the accessory is being removed */
if (wm8994->jackdet) {
/* Avoid a transient report when the accessory is being removed */
if (wm8994->jackdet) {
- re
g
= snd_soc_read(codec, WM1811_JACKDET_CTRL);
- if (re
g
< 0) {
+ re
t
= snd_soc_read(codec, WM1811_JACKDET_CTRL);
+ if (re
t
< 0) {
dev_err(codec->dev, "Failed to read jack status: %d\n",
dev_err(codec->dev, "Failed to read jack status: %d\n",
- re
g
);
- } else if (!(re
g
& WM1811_JACKDET_LVL)) {
+ re
t
);
+ } else if (!(re
t
& WM1811_JACKDET_LVL)) {
dev_dbg(codec->dev, "Ignoring removed jack\n");
return IRQ_HANDLED;
}
dev_dbg(codec->dev, "Ignoring removed jack\n");
return IRQ_HANDLED;
}