Merge branch 'fix/hda' into topic/hda (03c6901e) · Commits · e / devices / android_kernel_sony_msm8994

sound/pci/hda/patch_sigmatel.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2979,7 +2979,7 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
		}

		if ((spec->multiout.num_dacs - cfg->line_outs) > 0 &&
		cfg->hp_outs && !spec->multiout.hp_nid)
		cfg->hp_outs == 1 && !spec->multiout.hp_nid)
		spec->multiout.hp_nid = nid;

		if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) {
		@@ -4598,6 +4598,7 @@ again:
		spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP];
		spec->eapd_switch = 0;
		spec->num_amps = 1;
		spec->multiout.hp_nid = 0; /* dual HPs */

		if (!spec->init)
		spec->init = dell_m6_core_init;