diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-13 12:34:01 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-13 12:34:01 (GMT) |
commit | f48aa392219a22655417aa0e2d6889291e934c45 (patch) | |
tree | 54d15e58870b2e2a3b3dad5de9b6b4d0a7d0af86 /sound/soc/codecs/wm5102.c | |
parent | d37fb92326da880947d4dd72684ef1dd2d245727 (diff) | |
parent | 7d5cb4f7105e7cf12e58e6df5af0cbdb11060bca (diff) | |
download | linux-fsl-qoriq-f48aa392219a22655417aa0e2d6889291e934c45.tar.xz |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 803d6db..2adcfba 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); |