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

Commit cd8f76d1 authored by Wu Bo's avatar Wu Bo Committed by Greg Kroah-Hartman
Browse files

ALSA: hda/hdmi: fix without unlocked before return 



commit a2f647240998aa49632fb09b01388fdf2b87acfc upstream.

Fix the following coccicheck warning:
sound/pci/hda/patch_hdmi.c:1852:2-8: preceding lock on line 1846

After add sanity check to pass klockwork check,
The spdif_mutex should be unlock before return true
in check_non_pcm_per_cvt().

Fixes: 960a581e ("ALSA: hda: fix some klockwork scan warnings")
Signed-off-by: default avatarWu Bo <wubo40@huawei.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/1587907042-694161-1-git-send-email-wubo40@huawei.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a05346de

sound/pci/hda/patch_hdmi.c

+3 −1
Original line number Diff line number Diff line
@@ -1699,8 +1699,10 @@ static bool check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) 
	/* Add sanity check to pass klockwork check.

	 * This should never happen.

	 */

	if (WARN_ON(spdif == NULL))

	if (WARN_ON(spdif == NULL)) {

		mutex_unlock(&codec->spdif_mutex);

		return true;

	}

	non_pcm = !!(spdif->status & IEC958_AES0_NONAUDIO);

	mutex_unlock(&codec->spdif_mutex);

	return non_pcm;