diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2013-11-12 11:10:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 11:11:46 -0800 |
| commit | c6ebcc4a440d9d8243ce33ed6c95235125fe1a80 (patch) | |
| tree | 62b0ae8669d93c38f74f8fd3a19f9eb999028e49 /sound/pci | |
| parent | 705f5ab4855df0dee9abd526b170cb43632add72 (diff) | |
| download | linux-3.10-c6ebcc4a440d9d8243ce33ed6c95235125fe1a80.tar.gz linux-3.10-c6ebcc4a440d9d8243ce33ed6c95235125fe1a80.tar.bz2 linux-3.10-c6ebcc4a440d9d8243ce33ed6c95235125fe1a80.zip | |
ALSA: hda - Fix Line Out automute on Realtek multifunction jacks
commit 5959a6bc1124211a359525d209005abc07b0197b upstream.
In case there is both a multifunction headset jack and a Line Out
jack, automuting was not working properly from the Line Out jack.
This patch fixes that issue.
BugLink: https://bugs.launchpad.net/bugs/1250377
Tested-by: Cyrus Lien <cyrus.lien@canonical.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@linuxfoundation.org>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 48aa3cd7d0b..3a9bd60aa3e 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3093,8 +3093,10 @@ static void alc_update_headset_mode(struct hda_codec *codec) else new_headset_mode = ALC_HEADSET_MODE_HEADPHONE; - if (new_headset_mode == spec->current_headset_mode) + if (new_headset_mode == spec->current_headset_mode) { + snd_hda_gen_update_outputs(codec); return; + } switch (new_headset_mode) { case ALC_HEADSET_MODE_UNPLUGGED: |