At Tue, 18 Feb 2014 13:23:27 +0000, Liam Girdwood wrote:
On Tue, 2014-02-18 at 12:59 +0100, Lars-Peter Clausen wrote:
On 02/18/2014 12:36 PM, Takashi Iwai wrote:
The array contains too many elements although it should have only two.
Signed-off-by: Takashi Iwai tiwai@suse.de
sound/soc/codecs/ssm2602.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index f444d585b916..e32b82ff6304 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -75,15 +75,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", };
I never dared to change it because of the comment above the array. I must admit that I have no idea though why those extra None entries are necessary for OSS.
iirc the OSS input mixer in userspace may expect a similar number of entries to be compatible with the old Soundblaster16 input mixer ?
But this array is referred as having only two elements,
SOC_ENUM_SINGLE(SSM2602_APANA, 2, 2, ssm2602_input_select),
so the OSS access (via emulation) won't take more than two, either.
Takashi