diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-18 03:17:44 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-19 20:19:50 -0500 |
commit | b38fbe30739afa83695c4969c8e966d919d828b0 (patch) | |
tree | 33c1f64ce48095cb94760293be055e9be3398129 | |
parent | c924dc68f7371582cb420c003faadb700cd4f76c (diff) |
ASoC: ssm2602: Omit superfluous elements in input select array
The array contains too many elements although it should have only
two.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/codecs/ssm2602.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 49d28eaa6d73..12947096897c 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c | |||
@@ -63,15 +63,16 @@ static const u16 ssm2602_reg[SSM2602_CACHEREGNUM] = { | |||
63 | 63 | ||
64 | /*Appending several "None"s just for OSS mixer use*/ | 64 | /*Appending several "None"s just for OSS mixer use*/ |
65 | static const char *ssm2602_input_select[] = { | 65 | static const char *ssm2602_input_select[] = { |
66 | "Line", "Mic", "None", "None", "None", | 66 | "Line", "Mic", |
67 | "None", "None", "None", | ||
68 | }; | 67 | }; |
69 | 68 | ||
70 | static const char *ssm2602_deemph[] = {"None", "32Khz", "44.1Khz", "48Khz"}; | 69 | static const char *ssm2602_deemph[] = {"None", "32Khz", "44.1Khz", "48Khz"}; |
71 | 70 | ||
72 | static const struct soc_enum ssm2602_enum[] = { | 71 | static const struct soc_enum ssm2602_enum[] = { |
73 | SOC_ENUM_SINGLE(SSM2602_APANA, 2, 2, ssm2602_input_select), | 72 | SOC_ENUM_SINGLE(SSM2602_APANA, 2, ARRAY_SIZE(ssm2602_input_select), |
74 | SOC_ENUM_SINGLE(SSM2602_APDIGI, 1, 4, ssm2602_deemph), | 73 | ssm2602_input_select), |
74 | SOC_ENUM_SINGLE(SSM2602_APDIGI, 1, ARRAY_SIZE(ssm2602_deemph), | ||
75 | ssm2602_deemph), | ||
75 | }; | 76 | }; |
76 | 77 | ||
77 | static const unsigned int ssm260x_outmix_tlv[] = { | 78 | static const unsigned int ssm260x_outmix_tlv[] = { |