diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-10 01:41:37 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-10 01:41:37 +0100 |
| commit | 94c16ea6ea75f8f5de92d10a647155ccf0d05436 (patch) | |
| tree | 012d247bf686e1c49ef3ad0048b94de4970c066b /sound/soc/codecs/wm5102.c | |
| parent | Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | Linux 3.8-rc6 (diff) | |
| download | linux-94c16ea6ea75f8f5de92d10a647155ccf0d05436.tar.xz linux-94c16ea6ea75f8f5de92d10a647155ccf0d05436.zip | |
Merge tag 'v3.8-rc6' into next/cleanup
Linux 3.8-rc6
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 7a9048dad1cd..1440b3f9b7bb 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -896,8 +896,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); |