aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-02-18 09:37:30 +0100
committerBen Hutchings <ben@decadent.org.uk>2014-04-02 00:58:54 +0100
commit7ec5f1fb179c8f79246034259e36881a3d3186d1 (patch)
tree7f65cc45c45f278861b25413af5d79a6b2e9831d /sound/soc
parent768b167b17003911a613fde3acbcbc273462e405 (diff)
downloadkernel_samsung_smdk4412-7ec5f1fb179c8f79246034259e36881a3d3186d1.zip
kernel_samsung_smdk4412-7ec5f1fb179c8f79246034259e36881a3d3186d1.tar.gz
kernel_samsung_smdk4412-7ec5f1fb179c8f79246034259e36881a3d3186d1.tar.bz2
ASoC: wm8770: Fix wrong number of enum items
commit 7a6c0a58dc824523966f212c76322d47c5b0e6fe upstream. wm8770 codec driver defines ain_enum with a wrong number of items. Use SOC_ENUM_DOUBLE_DECL() macro and it's automatically fixed. Signed-off-by: Takashi Iwai <tiwai@suse.de> Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8770.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c
index aa05e65..d5f7d8d 100644
--- a/sound/soc/codecs/wm8770.c
+++ b/sound/soc/codecs/wm8770.c
@@ -163,8 +163,8 @@ static const char *ain_text[] = {
"AIN5", "AIN6", "AIN7", "AIN8"
};
-static const struct soc_enum ain_enum =
- SOC_ENUM_DOUBLE(WM8770_ADCMUX, 0, 4, 8, ain_text);
+static SOC_ENUM_DOUBLE_DECL(ain_enum,
+ WM8770_ADCMUX, 0, 4, ain_text);
static const struct snd_kcontrol_new ain_mux =
SOC_DAPM_ENUM("Capture Mux", ain_enum);