renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 06:04:14 +08:00
Code

ALSA: hda - Initialize output paths with current active states

Browse Source 
Set path->active flag at the path creation time and let the paths
initialized according to the current path->active state in
set_output_and_unmute().  This allows to modify the active flag of
some output paths dynamically, e.g. switching the front output route
with or without aamix like patch_via.c.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2013-01-03 16:33:02 +01:00
parent 985803ca91
commit e1284af730
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/pci/hda/hda_generic.c
View File

@ -873,8 +873,10 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
}
if (!path)
dac = dacs[i] = 0;
else
else {
print_nid_path("output", path);
path->active = true;
}
if (dac)
badness += assign_out_path_ctls(codec, pin, dac);
}
@ -1045,6 +1047,7 @@ static bool map_singles(struct hda_codec *codec, int outs,
dacs[i] = dac;
found = true;
print_nid_path("output", path);
path->active = true;
}
}
return found;
@ -2418,6 +2421,7 @@ static void parse_digital(struct hda_codec *codec)
if (!path)
continue;
print_nid_path("digout", path);
path->active = true;
if (!nums) {
spec->multiout.dig_out_nid = dig_nid;
spec->dig_out_type = spec->autocfg.dig_out_type[0];
@ -3556,10 +3560,8 @@ static void set_output_and_unmute(struct hda_codec *codec, hda_nid_t pin,
path = snd_hda_get_nid_path(codec, dac, pin);
if (!path)
return;
if (path->active)
return;
snd_hda_activate_path(codec, path, true, true);
set_pin_eapd(codec, pin, true);
snd_hda_activate_path(codec, path, path->active, true);
set_pin_eapd(codec, pin, path->active);
}
/* initialize primary output paths */