Revert "ALSA: hda/generic: Unconditionally prefer preferred_dacs pairs"
This reverts commit 17488b6baa
.
This commit is contained in:
parent
baca50617e
commit
4b7220a718
1 changed files with 2 additions and 2 deletions
|
@ -1377,7 +1377,7 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
|
|||
struct nid_path *path;
|
||||
hda_nid_t pin = pins[i];
|
||||
|
||||
if (!spec->preferred_dacs) {
|
||||
if (!spec->obey_preferred_dacs) {
|
||||
path = snd_hda_get_path_from_idx(codec, path_idx[i]);
|
||||
if (path) {
|
||||
badness += assign_out_path_ctls(codec, path);
|
||||
|
@ -1389,7 +1389,7 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
|
|||
if (dacs[i]) {
|
||||
if (is_dac_already_used(codec, dacs[i]))
|
||||
badness += bad->shared_primary;
|
||||
} else if (spec->preferred_dacs) {
|
||||
} else if (spec->obey_preferred_dacs) {
|
||||
badness += BAD_NO_PRIMARY_DAC;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue