| From f0ce27996217d06207c8bfda1b1bbec2fbab48c6 Mon Sep 17 00:00:00 2001 |
| From: David Henningsson <david.henningsson@canonical.com> |
| Date: Mon, 28 Feb 2011 15:58:07 +0100 |
| Subject: ALSA: HDA: Realtek: Fixup jack detection to input subsystem |
| |
| From: David Henningsson <david.henningsson@canonical.com> |
| |
| commit f0ce27996217d06207c8bfda1b1bbec2fbab48c6 upstream. |
| |
| This patch fixes an error in the jack detection reporting, |
| causing the jack detection sometimes not to be reported |
| correctly to the input subsystem. It should apply to several |
| Realtek codecs. |
| |
| 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> |
| |
| --- |
| sound/pci/hda/patch_realtek.c | 7 ++----- |
| 1 file changed, 2 insertions(+), 5 deletions(-) |
| |
| --- a/sound/pci/hda/patch_realtek.c |
| +++ b/sound/pci/hda/patch_realtek.c |
| @@ -1127,11 +1127,8 @@ static void alc_automute_speaker(struct |
| nid = spec->autocfg.hp_pins[i]; |
| if (!nid) |
| break; |
| - if (snd_hda_jack_detect(codec, nid)) { |
| - spec->jack_present = 1; |
| - break; |
| - } |
| - alc_report_jack(codec, spec->autocfg.hp_pins[i]); |
| + alc_report_jack(codec, nid); |
| + spec->jack_present |= snd_hda_jack_detect(codec, nid); |
| } |
| |
| mute = spec->jack_present ? HDA_AMP_MUTE : 0; |
