summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm5102.c
diff options
context:
space:
mode:
authorMark Brown2013-01-13 13:34:01 +0100
committerMark Brown2013-01-13 13:34:01 +0100
commitf48aa392219a22655417aa0e2d6889291e934c45 (patch)
tree54d15e58870b2e2a3b3dad5de9b6b4d0a7d0af86 /sound/soc/codecs/wm5102.c
parentMerge remote-tracking branch 'asoc/topic/adsp' into asoc-arizona (diff)
parentASoC: wm5110: Correct AEC loopback mask (diff)
downloadkernel-qcow2-linux-f48aa392219a22655417aa0e2d6889291e934c45.tar.gz
kernel-qcow2-linux-f48aa392219a22655417aa0e2d6889291e934c45.tar.xz
kernel-qcow2-linux-f48aa392219a22655417aa0e2d6889291e934c45.zip
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona
Diffstat (limited to 'sound/soc/codecs/wm5102.c')
-rw-r--r--sound/soc/codecs/wm5102.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 803d6db0eb69..2adcfbae4d22 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -948,8 +948,7 @@ static const unsigned int wm5102_aec_loopback_values[] = {
static const struct soc_enum wm5102_aec_loopback =
SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1,
- ARIZONA_AEC_LOOPBACK_SRC_SHIFT,
- ARIZONA_AEC_LOOPBACK_SRC_MASK,
+ ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf,
ARRAY_SIZE(wm5102_aec_loopback_texts),
wm5102_aec_loopback_texts,
wm5102_aec_loopback_values);