|
@@ -1125,6 +1125,7 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch,
|
|
|
|
|
|
*index = 0;
|
|
*index = 0;
|
|
if (cfg->line_outs == 1 && !spec->multi_ios &&
|
|
if (cfg->line_outs == 1 && !spec->multi_ios &&
|
|
|
|
+ !codec->force_pin_prefix &&
|
|
!cfg->hp_outs && !cfg->speaker_outs)
|
|
!cfg->hp_outs && !cfg->speaker_outs)
|
|
return spec->vmaster_mute.hook ? "PCM" : "Master";
|
|
return spec->vmaster_mute.hook ? "PCM" : "Master";
|
|
|
|
|
|
@@ -1132,6 +1133,7 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch,
|
|
* use it master (or "PCM" if a vmaster hook is present)
|
|
* use it master (or "PCM" if a vmaster hook is present)
|
|
*/
|
|
*/
|
|
if (spec->multiout.num_dacs == 1 && !spec->mixer_nid &&
|
|
if (spec->multiout.num_dacs == 1 && !spec->mixer_nid &&
|
|
|
|
+ !codec->force_pin_prefix &&
|
|
!spec->multiout.hp_out_nid[0] && !spec->multiout.extra_out_nid[0])
|
|
!spec->multiout.hp_out_nid[0] && !spec->multiout.extra_out_nid[0])
|
|
return spec->vmaster_mute.hook ? "PCM" : "Master";
|
|
return spec->vmaster_mute.hook ? "PCM" : "Master";
|
|
|
|
|