diff options
| author | Lydia Wang <lydiawang@viatech.com.cn> | 2011-04-28 16:03:39 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-28 11:35:18 +0200 |
| commit | 525566cb60e167ca1cd770f3d0738735ec3503bb (patch) | |
| tree | 160e3aefb337485dd6baccd808b34255cf05eea4 /sound/pci | |
| parent | 54a96dadaa2bbe81006c66447517b57534d80e7f (diff) | |
| download | kernel_samsung_aries-525566cb60e167ca1cd770f3d0738735ec3503bb.zip kernel_samsung_aries-525566cb60e167ca1cd770f3d0738735ec3503bb.tar.gz kernel_samsung_aries-525566cb60e167ca1cd770f3d0738735ec3503bb.tar.bz2 | |
ALSA: hda - VIA: Fix notify_aa_path_ctls() invalid issue.
In notify_aa_path_ctls(), adds 'rear mic' item and confirms the A-A
path control existing before notifying card that the A-A path volume
is muted if smart5.1 is enabled.
Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_via.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 1371b57..0997031 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -1292,14 +1292,18 @@ static void notify_aa_path_ctls(struct hda_codec *codec) { int i; struct snd_ctl_elem_id id; - const char *labels[] = {"Mic", "Front Mic", "Line"}; + const char *labels[] = {"Mic", "Front Mic", "Line", "Rear Mic"}; + struct snd_kcontrol *ctl; memset(&id, 0, sizeof(id)); id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; for (i = 0; i < ARRAY_SIZE(labels); i++) { sprintf(id.name, "%s Playback Volume", labels[i]); - snd_ctl_notify(codec->bus->card, SNDRV_CTL_EVENT_MASK_VALUE, - &id); + ctl = snd_hda_find_mixer_ctl(codec, id.name); + if (ctl) + snd_ctl_notify(codec->bus->card, + SNDRV_CTL_EVENT_MASK_VALUE, + &ctl->id); } } |