Skip to content

Commit

Permalink
ALSA: hda - Name the primary out as Speaker when needed for VIA codecs
Browse files Browse the repository at this point in the history
When the primary output is the speaker output, rather name it as
"Speaker".  This will be more intuitive.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Jun 20, 2011
1 parent 13af8e7 commit 6aadf41
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion sound/pci/hda/patch_via.c
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,11 @@ static int via_auto_create_multi_out_ctls(struct hda_codec *codec)
if (err < 0)
return err;
} else {
err = create_ch_ctls(codec, chname[i], pin, dac, 3);
const char *pfx = chname[i];
if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT &&
cfg->line_outs == 1)
pfx = "Speaker";
err = create_ch_ctls(codec, pfx, pin, dac, 3);
if (err < 0)
return err;
}
Expand Down

0 comments on commit 6aadf41

Please sign in to comment.