projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ecbda04
)
ASoC: wm8770: Fix wrong number of enum items
author
Takashi Iwai
<tiwai@suse.de>
Tue, 18 Feb 2014 08:37:30 +0000
(09:37 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 7 Mar 2014 05:30:07 +0000
(21:30 -0800)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/codecs/wm8770.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm8770.c
b/sound/soc/codecs/wm8770.c
index 89a18d82f303e168f874a418840a9d33a4923910..5bce2101348514aa6508dc9dac7f895d176ae0d9 100644
(file)
--- a/
sound/soc/codecs/wm8770.c
+++ b/
sound/soc/codecs/wm8770.c
@@
-196,8
+196,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);