Merge branch 'fix/hda' into topic/hda (b3225190) · Commits · e / devices / android_kernel_teracube_emerald

sound/pci/hda/patch_sigmatel.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1227,7 +1227,7 @@ static const char *slave_vols[] = {
		"LFE Playback Volume",
		"Side Playback Volume",
		"Headphone Playback Volume",
		"Headphone Playback Volume",
		"Headphone2 Playback Volume",
		"Speaker Playback Volume",
		"External Speaker Playback Volume",
		"Speaker2 Playback Volume",
		@@ -1241,7 +1241,7 @@ static const char *slave_sws[] = {
		"LFE Playback Switch",
		"Side Playback Switch",
		"Headphone Playback Switch",
		"Headphone Playback Switch",
		"Headphone2 Playback Switch",
		"Speaker Playback Switch",
		"External Speaker Playback Switch",
		"Speaker2 Playback Switch",
		@@ -3514,6 +3514,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
		if (! spec->autocfg.line_outs)
		return 0; /* can't find valid pin config */

		#if 0 /* FIXME: temporarily disabled */
		/* If we have no real line-out pin and multiple hp-outs, HPs should
		* be set up as multi-channel outputs.
		*/
		@@ -3533,6 +3534,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
		spec->autocfg.line_out_type = AUTO_PIN_HP_OUT;
		spec->autocfg.hp_outs = 0;
		}
		#endif /* FIXME: temporarily disabled */
		if (spec->autocfg.mono_out_pin) {
		int dir = get_wcaps(codec, spec->autocfg.mono_out_pin) &
		(AC_WCAP_OUT_AMP \| AC_WCAP_IN_AMP);