Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353031
b: refs/heads/master
c: 52a8efa
h: refs/heads/master
i:
  353029: 03bfec8
  353027: 4ef5512
  353023: c7fb17e
v: v3
  • Loading branch information
Takashi Iwai committed Jan 12, 2013
1 parent 4fb3829 commit 9c4b5aa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3bd7b644d049feb8df4225492689a324963f42f4
refs/heads/master: 52a8efab10637ae5f58123be3ab3b9cb6a9ff2b0
9 changes: 8 additions & 1 deletion trunk/sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -2306,7 +2306,14 @@ static const char *alc_get_line_out_pfx(struct alc_spec *spec, int ch,
*index = 0;
if (cfg->line_outs == 1 && !spec->multi_ios &&
!cfg->hp_outs && !cfg->speaker_outs && can_be_master)
return "Master";
return spec->vmaster_mute.hook ? "PCM" : "Master";

/* if there is really a single DAC used in the whole output paths,
* use it master (or "PCM" if a vmaster hook is present)
*/
if (spec->multiout.num_dacs == 1 && !spec->mixer_nid &&
!spec->multiout.hp_out_nid[0] && !spec->multiout.extra_out_nid[0])
return spec->vmaster_mute.hook ? "PCM" : "Master";

switch (cfg->line_out_type) {
case AUTO_PIN_SPEAKER_OUT:
Expand Down

0 comments on commit 9c4b5aa

Please sign in to comment.