projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2cef68
)
ASoC: rt286: correct the OR to AND
author
Jie Yang
<yang.jie@intel.com>
Fri, 27 Feb 2015 04:52:26 +0000
(12:52 +0800)
committer
Mark Brown
<broonie@kernel.org>
Fri, 6 Mar 2015 20:17:10 +0000
(20:17 +0000)
Here it should be AND(&) to check the status.
Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt286.c
patch
|
blob
|
blame
|
history
diff --git
a/sound/soc/codecs/rt286.c
b/sound/soc/codecs/rt286.c
index 16723b167fbf0dd473d99781b62b98e2b11de1de..49c44a77b5188d9ff2d12db124573ab2215ee156 100644
(file)
--- a/
sound/soc/codecs/rt286.c
+++ b/
sound/soc/codecs/rt286.c
@@
-397,7
+397,7
@@
int rt286_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
if (jack) {
/* enable IRQ */
- if (rt286->jack->status
|
SND_JACK_HEADPHONE)
+ if (rt286->jack->status
&
SND_JACK_HEADPHONE)
snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO1");
regmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x2);
/* Send an initial empty report */