diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2011-02-28 15:58:07 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 14:17:32 -0700 |
| commit | 6b01a69dd7e4dd65bbb4654167b6c88cb8461bdb (patch) | |
| tree | ca201853267dc7eeb5b32f7b95fbb68c962ce524 | |
| parent | 39ebd87f25cc84d03f95379fa353bd9c385e76fa (diff) | |
| download | lwn-6b01a69dd7e4dd65bbb4654167b6c88cb8461bdb.tar.gz lwn-6b01a69dd7e4dd65bbb4654167b6c88cb8461bdb.zip | |
ALSA: HDA: Realtek: Fixup jack detection to input subsystem
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>
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 0bc6e4e3293a..e61c87c0ad4a 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1127,11 +1127,8 @@ static void alc_automute_speaker(struct hda_codec *codec, int pinctl) 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; |