ALSA: HDA VIA: Modify vt1708_auto_create_multi_out_ctls.
PATCH 18/30 ALSA: HDA VIA: Modify vt1708_auto_create_multi_out_ctls.
From: Lydia Wang <[email protected]>
Subject: ALSA: HDA VIA: Modify vt1708_auto_create_multi_out_ctls.
Rewrite nid_vol/mute assignment for clearity, and check line connection before adding control for it.
Signed-off-by Lydia Wang <[email protected]>
Signed-off-by Logan Li <[email protected]>
--- sound/pci/hda/patch_via.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
sound/pci/hda/patch_via.c +4 -5
@@ -1570,7 +1570,7 @@ {char name[32 ];static const char *chname[4 ] = {"Front" ,"Surround" ,"C/LFE" ,"Side" }; -hda_nid_t nid, nid_vol =0 ; +hda_nid_t nid, nid_vol, nid_vols[] = {0x17 ,0x19 ,0x1a ,0x1b };int i, err;for (i =0 ; i <=AUTO_SEQ_SIDE ; i++) {
@@ -1579,8 +1579,7 @@if (!nid)continue ; -if (i !=AUTO_SEQ_FRONT ) - nid_vol =0x18 + i; + nid_vol = nid_vols[i];if (i ==AUTO_SEQ_CENLFE ) {/* Center/LFE */
@@ -1612,13 +1611,13 @@/* add control to mixer index 0 */ err =via_add_control (spec,VIA_CTL_WIDGET_VOL ,"Master Front Playback Volume" , -HDA_COMPOSE_AMP_VAL (0x17 ,3 ,0 , +HDA_COMPOSE_AMP_VAL (nid_vol,3 ,0 ,HDA_INPUT ));if (err <0 )return err; err =via_add_control (spec,VIA_CTL_WIDGET_MUTE ,"Master Front Playback Switch" , -HDA_COMPOSE_AMP_VAL (0x17 ,3 ,0 , +HDA_COMPOSE_AMP_VAL (nid_vol,3 ,0 ,HDA_INPUT ));if (err <0 )return err;