git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virtio: console: Don't access vqs if device was unplugged
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
wm8994.c
diff --git
a/sound/soc/codecs/wm8994.c
b/sound/soc/codecs/wm8994.c
index
a60b5db
..
ebaee5c
100644
(file)
--- a/
sound/soc/codecs/wm8994.c
+++ b/
sound/soc/codecs/wm8994.c
@@
-3000,11
+3000,10
@@
static void wm8958_default_micdet(u16 status, void *data)
report |= SND_JACK_BTN_5;
done:
report |= SND_JACK_BTN_5;
done:
- snd_soc_jack_report(wm8994->micdet[0].jack,
+ snd_soc_jack_report(wm8994->micdet[0].jack,
report,
SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 |
SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5 |
SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 |
SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5 |
- SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT,
- report);
+ SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT);
}
/**
}
/**