diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-18 09:17:44 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-20 10:19:50 +0900 |
commit | b38fbe30739afa83695c4969c8e966d919d828b0 (patch) | |
tree | 33c1f64ce48095cb94760293be055e9be3398129 /sound/soc/codecs/ssm2602.c | |
parent | c924dc68f7371582cb420c003faadb700cd4f76c (diff) | |
download | linux-stable-b38fbe30739afa83695c4969c8e966d919d828b0.tar.gz linux-stable-b38fbe30739afa83695c4969c8e966d919d828b0.tar.bz2 linux-stable-b38fbe30739afa83695c4969c8e966d919d828b0.zip |
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>
Diffstat (limited to 'sound/soc/codecs/ssm2602.c')
-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] = { /*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[] = { |