Call the path activation for the digital input pin properly, not only setting the pin control. Also add spec->digin_path for keeping the path index.
Signed-off-by: Takashi Iwai tiwai@suse.de --- sound/pci/hda/hda_generic.c | 8 +++++++- sound/pci/hda/hda_generic.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 2296839..65883c7 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -2519,6 +2519,7 @@ static void parse_digital(struct hda_codec *codec) print_nid_path("digin", path); path->active = true; spec->dig_in_nid = dig_nid; + spec->digin_path = snd_hda_get_path_idx(codec, path); break; } } @@ -3786,8 +3787,13 @@ static void init_digital(struct hda_codec *codec) spec->digout_paths[i]); } pin = spec->autocfg.dig_in_pin; - if (pin) + if (pin) { + struct nid_path *path; snd_hda_set_pin_ctl_cache(codec, pin, PIN_IN); + path = snd_hda_get_path_from_idx(codec, spec->digin_path); + if (path) + snd_hda_activate_path(codec, path, path->active, false); + } }
/* clear unsol-event tags on unused pins; Conexant codecs seem to leave diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 71d409f..ba8de12 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -136,6 +136,7 @@ struct hda_gen_spec { int speaker_paths[AUTO_CFG_MAX_OUTS]; int digout_paths[AUTO_CFG_MAX_OUTS]; int loopback_paths[HDA_MAX_NUM_INPUTS]; + int digin_path;
/* auto-mic stuff */ int am_num_entries;