]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ALSA: hda - Improve auto-cfg mixer name for ALC880
authorTakashi Iwai <tiwai@suse.de>
Tue, 25 Aug 2009 14:05:03 +0000 (16:05 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 25 Aug 2009 14:05:03 +0000 (16:05 +0200)
When there is only one DAC is used for ALC880, try to assign a better
name, either Speaker or Front, depending on the output pin type.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_realtek.c

index 3c8773a7ac914c2d9493ec7deaad30b6c72cf6b2..07fbf7db69e3d6f96d1343d94be383eb5994e4b5 100644 (file)
@@ -4398,13 +4398,19 @@ static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec,
                        if (err < 0)
                                return err;
                } else {
-                       sprintf(name, "%s Playback Volume", chname[i]);
+                       const char *pfx;
+                       if (cfg->line_outs == 1 &&
+                           cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
+                               pfx = "Speaker";
+                       else
+                               pfx = chname[i];
+                       sprintf(name, "%s Playback Volume", pfx);
                        err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
                                          HDA_COMPOSE_AMP_VAL(nid, 3, 0,
                                                              HDA_OUTPUT));
                        if (err < 0)
                                return err;
-                       sprintf(name, "%s Playback Switch", chname[i]);
+                       sprintf(name, "%s Playback Switch", pfx);
                        err = add_control(spec, ALC_CTL_BIND_MUTE, name,
                                          HDA_COMPOSE_AMP_VAL(nid, 3, 2,
                                                              HDA_INPUT));