diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-28 16:24:56 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-28 16:24:56 +0100 |
| commit | 0c3d4622a9e24e1d0efc95b6360f37a006ec2323 (patch) | |
| tree | d30919601f0341a27011062f98ccac9c473bdd56 /sound | |
| parent | 23b719bcc00bbcf87c1ec729f49840f47fdfdf5d (diff) | |
| parent | f0ce27996217d06207c8bfda1b1bbec2fbab48c6 (diff) | |
Merge branch 'fix/hda' into for-next
Diffstat (limited to 'sound')
| -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 e4f6ec80a979..3b4d49313a49 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; |