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

Commit f2ad24fa authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Detach from converter at closing in patch_hdmi.c 



The generic HDMI code detaches the converter from the stream when
unused, but it must be done rather in the close callback instead of
the cleanup callback.

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

sound/pci/hda/patch_hdmi.c

+4 −7
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, 
	return hdmi_setup_stream(codec, cvt_nid, pin_nid, stream_tag, format);

}



static int generic_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,

static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,

			  struct hda_codec *codec,

			  struct snd_pcm_substream *substream)

{
@@ -1171,8 +1171,6 @@ static int generic_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, 
	struct hdmi_spec_per_pin *per_pin;

	int pinctl;



	snd_hda_codec_cleanup_stream(codec, hinfo->nid);



	if (hinfo->nid) {

		cvt_idx = cvt_nid_to_cvt_index(spec, hinfo->nid);

		if (snd_BUG_ON(cvt_idx < 0))
@@ -1195,14 +1193,13 @@ static int generic_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, 
				    pinctl & ~PIN_OUT);

		snd_hda_spdif_ctls_unassign(codec, pin_idx);

	}



	return 0;

}



static const struct hda_pcm_ops generic_ops = {

	.open = hdmi_pcm_open,

	.close = hdmi_pcm_close,

	.prepare = generic_hdmi_playback_pcm_prepare,

	.cleanup = generic_hdmi_playback_pcm_cleanup,

};



static int generic_hdmi_build_pcms(struct hda_codec *codec)