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

Commit 2ad779b7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Release assigned pin/cvt at error path of hdmi_pcm_open() 



If the driver detects and invalid ELD, it gives an open error.
But it forgot to release the assigned pin, converter and spdif ctls
before returning.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4a7c516b

sound/pci/hda/patch_hdmi.c

+5 −1
Original line number Diff line number Diff line
@@ -1100,9 +1100,13 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, 
	if (!static_hdmi_pcm && eld->eld_valid) {

		snd_hdmi_eld_update_pcm_info(eld, hinfo);

		if (hinfo->channels_min > hinfo->channels_max ||

		    !hinfo->rates || !hinfo->formats)

		    !hinfo->rates || !hinfo->formats) {

			per_cvt->assigned = 0;

			hinfo->nid = 0;

			snd_hda_spdif_ctls_unassign(codec, pin_idx);

			return -ENODEV;

		}

	}



	/* Store the updated parameters */

	runtime->hw.channels_min = hinfo->channels_min;