]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge remote-tracking branch 'asoc/fix/adsp' into asoc-linus
authorMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:11 +0000 (17:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:11 +0000 (17:20 +0100)
sound/soc/codecs/wm_adsp.c

index 3470b649c0b26b6479ea89c9a1ecd799cbc6ce7c..0a3c7f7040169a48a577ae57c4e2c9ff0600feea 100644 (file)
@@ -279,7 +279,7 @@ static const struct soc_enum wm_adsp2_rate_enum[] = {
                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
                              ARIZONA_RATE_ENUM_SIZE,
                              arizona_rate_text, arizona_rate_val),
-       SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP3_CONTROL_1,
+       SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP4_CONTROL_1,
                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
                              ARIZONA_RATE_ENUM_SIZE,
                              arizona_rate_text, arizona_rate_val),