From 9c4b5aad73df1271f57beb197eec347c44f61e84 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 18 Dec 2012 17:33:04 +0100 Subject: [PATCH] --- yaml --- r: 353031 b: refs/heads/master c: 52a8efab10637ae5f58123be3ab3b9cb6a9ff2b0 h: refs/heads/master i: 353029: 03bfec8751dd2f211d219c901c56f8926f470874 353027: 4ef551272507f9dc492ebc2f2b0385f4ab940110 353023: c7fb17ee1e095d3b3d341fa1002924c14876e6b1 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_realtek.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 59223ceecc7c..6963b43bff9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bd7b644d049feb8df4225492689a324963f42f4 +refs/heads/master: 52a8efab10637ae5f58123be3ab3b9cb6a9ff2b0 diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c index a3046144f149..f21c53d437db 100644 --- a/trunk/sound/pci/hda/patch_realtek.c +++ b/trunk/sound/pci/hda/patch_realtek.c @@ -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: