]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: ssm2602: Omit superfluous elements in input select array
authorTakashi Iwai <tiwai@suse.de>
Tue, 18 Feb 2014 08:17:44 +0000 (09:17 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 20 Feb 2014 01:19:50 +0000 (10:19 +0900)
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>
sound/soc/codecs/ssm2602.c

index 49d28eaa6d735f52dd3580e0292c4d3c297039b3..12947096897c8903688ddb07de17311a84ff9ef6 100644 (file)
@@ -63,15 +63,16 @@ static const u16 ssm2602_reg[SSM2602_CACHEREGNUM] = {
 
 /*Appending several "None"s just for OSS mixer use*/
 static const char *ssm2602_input_select[] = {
-       "Line", "Mic", "None", "None", "None",
-       "None", "None", "None",
+       "Line", "Mic",
 };
 
 static const char *ssm2602_deemph[] = {"None", "32Khz", "44.1Khz", "48Khz"};
 
 static const struct soc_enum ssm2602_enum[] = {
-       SOC_ENUM_SINGLE(SSM2602_APANA, 2, 2, ssm2602_input_select),
-       SOC_ENUM_SINGLE(SSM2602_APDIGI, 1, 4, ssm2602_deemph),
+       SOC_ENUM_SINGLE(SSM2602_APANA, 2, ARRAY_SIZE(ssm2602_input_select),
+                       ssm2602_input_select),
+       SOC_ENUM_SINGLE(SSM2602_APDIGI, 1, ARRAY_SIZE(ssm2602_deemph),
+                       ssm2602_deemph),
 };
 
 static const unsigned int ssm260x_outmix_tlv[] = {