aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/pci/oxygen/oxygen_mixer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index fcb5813183fb..aa3a5c53d605 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -524,7 +524,7 @@ static DECLARE_TLV_DB_SCALE(ac97_db_scale, -3450, 150, 0);
524static const struct snd_kcontrol_new controls[] = { 524static const struct snd_kcontrol_new controls[] = {
525 { 525 {
526 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 526 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
527 .name = "PCM Playback Volume", 527 .name = "Master Playback Volume",
528 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | 528 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
529 SNDRV_CTL_ELEM_ACCESS_TLV_READ, 529 SNDRV_CTL_ELEM_ACCESS_TLV_READ,
530 .info = dac_volume_info, 530 .info = dac_volume_info,
@@ -536,7 +536,7 @@ static const struct snd_kcontrol_new controls[] = {
536 }, 536 },
537 { 537 {
538 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 538 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
539 .name = "PCM Playback Switch", 539 .name = "Master Playback Switch",
540 .info = snd_ctl_boolean_mono_info, 540 .info = snd_ctl_boolean_mono_info,
541 .get = dac_mute_get, 541 .get = dac_mute_get,
542 .put = dac_mute_put, 542 .put = dac_mute_put,
@@ -637,7 +637,7 @@ int oxygen_mixer_init(struct oxygen *chip)
637 ctl = snd_ctl_new1(&controls[i], chip); 637 ctl = snd_ctl_new1(&controls[i], chip);
638 if (!ctl) 638 if (!ctl)
639 return -ENOMEM; 639 return -ENOMEM;
640 if (!strcmp(ctl->id.name, "PCM Playback Volume")) 640 if (!strcmp(ctl->id.name, "Master Playback Volume"))
641 ctl->tlv.p = chip->model->dac_tlv; 641 ctl->tlv.p = chip->model->dac_tlv;
642 else if (chip->model->cd_in_from_video_in && 642 else if (chip->model->cd_in_from_video_in &&
643 !strncmp(ctl->id.name, "CD Capture ", 11)) 643 !strncmp(ctl->id.name, "CD Capture ", 11))