diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2011-03-04 14:22:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-23 13:03:54 -0700 |
| commit | f7ff876d0fba7e28c10c78a5004c350f816b8a6e (patch) | |
| tree | 287924490acb5bd2615f726ec4362c9b08f9e952 | |
| parent | 8a805f1e7f3aea14039f7d57836e5f6ea993f37e (diff) | |
| download | kernel-adaptation-pc-f7ff876d0fba7e28c10c78a5004c350f816b8a6e.tar.gz kernel-adaptation-pc-f7ff876d0fba7e28c10c78a5004c350f816b8a6e.tar.bz2 kernel-adaptation-pc-f7ff876d0fba7e28c10c78a5004c350f816b8a6e.zip | |
ALSA: HDA: Fixup unnecessary volume control index on Realtek ALC88x
commit 7e59e097c09b82760bb0fe08b0fa2b704d76c3f4 upstream.
Without this change, a volume control named "Surround" or "Side" would
get an unnecessary index, causing it to be ignored by the vmaster and
PulseAudio.
Tested-by: Bartłomiej Żogała <nusch88@gmail.com>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8c61566bdc5..ffb05bd54ba 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5207,16 +5207,19 @@ static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec, return err; } else { const char *name = pfx; - if (!name) + int index = i; + if (!name) { name = chname[i]; + index = 0; + } err = __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, - name, i, + name, index, HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT)); if (err < 0) return err; err = __add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, - name, i, + name, index, HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT)); if (err < 0) |