xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/hda' into topic/hda

Browse Source 
Speaker-Out renames are merged.

Conflicts:
	sound/pci/hda/patch_realtek.c
This commit is contained in:
Takashi Iwai
2012-03-02 09:00:33 +01:00
parent 07cafff288 e49a3434f1
commit 7c589750a7
12 changed files with 79 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/hda/patch_sigmatel.c
View File

@@ -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