Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: hda/ca0132 - Remove input select enum for ZxR

This patch removes the input select control for the ZxR, as it only has
one input option, rear microphone.

Signed-off-by: Connor McAdams <conmanx360@gmail.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Connor McAdams and committed by
Takashi Iwai
76dea4db 55845949

+14 -1
+14 -1
sound/pci/hda/patch_ca0132.c
··· 6402 6402 */ 6403 6403 if (spec->use_alt_functions) { 6404 6404 ca0132_alt_add_output_enum(codec); 6405 - ca0132_alt_add_input_enum(codec); 6406 6405 ca0132_alt_add_mic_boost_enum(codec); 6406 + /* 6407 + * ZxR only has microphone input, there is no front panel 6408 + * header on the card, and aux-in is handled by the DBPro board. 6409 + */ 6410 + if (spec->quirk != QUIRK_ZXR) 6411 + ca0132_alt_add_input_enum(codec); 6407 6412 } 6408 6413 6409 6414 if (spec->quirk == QUIRK_AE5) { ··· 7669 7664 spec->voicefx_val = 0; 7670 7665 spec->effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID] = 1; 7671 7666 spec->effects_switch[CRYSTAL_VOICE - EFFECT_START_NID] = 0; 7667 + 7668 + /* 7669 + * The ZxR doesn't have a front panel header, and it's line-in is on 7670 + * the daughter board. So, there is no input enum control, and we need 7671 + * to make sure that spec->in_enum_val is set properly. 7672 + */ 7673 + if (spec->quirk == QUIRK_ZXR) 7674 + spec->in_enum_val = REAR_MIC; 7672 7675 7673 7676 #ifdef ENABLE_TUNING_CONTROLS 7674 7677 ca0132_init_tuning_defaults(codec);