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

tiwai · tiwai · commit 3d5c5fdcee0f · 2021-01-01T21:08:53.000+01:00
The silent_stream_disable() function introduced by the commit b1a5039 ("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: b1a5039 ("ALSA: hda/hdmi: fix silent stream for first playback to DP") Reported-by: Jan Alexander Steffens (heftig) <heftig@archlinux.org> Cc: <stable@vger.kernel.org> Acked-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20210101083852.12094-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
@@ -1733,7 +1733,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 */

Original file line number	Diff line number	Diff line change
`@@ -1733,7 +1733,7 @@ static void silent_stream_disable(struct hda_codec *codec,`
`1733`	`1733`	`per_pin->silent_stream = false;`
`1734`	`1734`
`1735`	`1735`	`unlock_out:`
`1736`		`- mutex_unlock(&spec->pcm_lock);`
	`1736`	`+ mutex_unlock(&per_pin->lock);`
`1737`	`1737`	`}`
`1738`	`1738`
`1739`	`1739`	`/* update ELD and jack state via audio component */`