Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82b1d73f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix left-over merge issues in patch_hdmi.c 



Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 78c058df

sound/pci/hda/patch_hdmi.c

+1 −3
Original line number Diff line number Diff line
@@ -805,7 +805,6 @@ static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res) 


static void hdmi_unsol_event(struct hda_codec *codec, unsigned int res)

{

	struct hdmi_spec *spec = codec->spec;

	int tag = res >> AC_UNSOL_RES_TAG_SHIFT;

	int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT;
@@ -1242,7 +1241,6 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx) 
	if (pcmdev > 0)

		sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev);



	hdmi_present_sense(per_pin, 0);

	return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0);

}
@@ -1274,7 +1272,7 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) 
		if (err < 0)

			return err;



		hdmi_present_sense(per_pin, false);

		hdmi_present_sense(per_pin, 0);

	}



	return 0;