提交 7dd8ff75 编写于 作者: T Takashi Iwai 提交者: Zheng Zengkai

ALSA: hda/hdmi: Fix incorrect mutex unlock in silent_stream_disable()

stable inclusion
from stable-5.10.6
commit adee1c5126ef0aa7951e0ba101b73a3cd6732c09
bugzilla: 47418

--------------------------------

commit 3d5c5fdc upstream.

The silent_stream_disable() function introduced by the commit
b1a50397 ("ALSA: hda/hdmi: fix silent stream for first playback to
DP") takes the per_pin->lock mutex, but it unlocks the wrong one,
spec->pcm_lock, which causes a deadlock.  This patch corrects it.

Fixes: b1a50397 ("ALSA: hda/hdmi: fix silent stream for first playback to DP")
Reported-by: NJan Alexander Steffens (heftig) <heftig@archlinux.org>
Cc: <stable@vger.kernel.org>
Acked-by: NKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210101083852.12094-1-tiwai@suse.deSigned-off-by: NTakashi Iwai <tiwai@suse.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 e1888138
......@@ -1736,7 +1736,7 @@ static void silent_stream_disable(struct hda_codec *codec,
per_pin->silent_stream = false;
unlock_out:
mutex_unlock(&spec->pcm_lock);
mutex_unlock(&per_pin->lock);
}
/* update ELD and jack state via audio component */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册