diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2011-02-28 15:58:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-28 16:23:13 +0100 |
| commit | f0ce27996217d06207c8bfda1b1bbec2fbab48c6 (patch) | |
| tree | 82ee8a2155b4a6a48ce0dd9ac1279ea7002bebe1 /sound/pci/hda | |
| parent | 11be6a269d2ad3e94c0597f21786092b8340a822 (diff) | |
| download | linux-f0ce27996217d06207c8bfda1b1bbec2fbab48c6.tar.gz linux-f0ce27996217d06207c8bfda1b1bbec2fbab48c6.tar.bz2 linux-f0ce27996217d06207c8bfda1b1bbec2fbab48c6.zip | |
ALSA: HDA: Realtek: Fixup jack detection to input subsystem
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.
Cc: stable@kernel.org
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
| -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 3328a259a242..c052fc5ad0c9 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1133,11 +1133,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; |