diff options
| author | Wu Bo <wubo40@huawei.com> | 2020-04-26 15:17:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-04-29 09:25:37 +0200 |
| commit | a2f647240998aa49632fb09b01388fdf2b87acfc (patch) | |
| tree | 6e8f56aa9d7daef3666f3d4b2fe68baff65406e2 /sound | |
| parent | ALSA: hda/hdmi: fix race in monitor detection during probe (diff) | |
| download | linux-a2f647240998aa49632fb09b01388fdf2b87acfc.tar.xz linux-a2f647240998aa49632fb09b01388fdf2b87acfc.zip | |
ALSA: hda/hdmi: fix without unlocked before return
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: 960a581e22d9 ("ALSA: hda: fix some klockwork scan warnings")
Signed-off-by: Wu 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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 2e2c382fe4b5..93760a3564cf 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1848,8 +1848,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; |