diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-02 09:00:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-02 09:00:33 +0100 |
| commit | 7c589750a70831b8cee3c10e01c297fefde104e3 (patch) | |
| tree | 871da898d9953dd50c4830400ba1dd0b614ee311 /sound/pci/hda/patch_sigmatel.c | |
| parent | ALSA: hda/conexant - Clear unsol events on unused pins (diff) | |
| parent | ALSA: hda - Kill hyphenated names (diff) | |
| download | linux-7c589750a70831b8cee3c10e01c297fefde104e3.tar.xz linux-7c589750a70831b8cee3c10e01c297fefde104e3.zip | |
Merge branch 'fix/hda' into topic/hda
Speaker-Out renames are merged.
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 8c346ac59d46..5988dbdedc4e 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4638,7 +4638,7 @@ static void stac92xx_hp_detect(struct hda_codec *codec) unsigned int val = AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN; if (no_hp_sensing(spec, i)) continue; - if (presence) + if (1 /*presence*/) stac92xx_set_pinctl(codec, cfg->hp_pins[i], val); #if 0 /* FIXME */ /* Resetting the pinctl like below may lead to (a sort of) regressions |