summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-02-28 08:36:06 +0100
committerTakashi Iwai <tiwai@suse.de>2018-02-28 08:40:26 +0100
commit350144069abf351c743d766b2fba9cb9b7cd32a1 (patch)
tree55abb4a7f5d803c0dba38ab1212531922ba450cd /sound
parentALSA: control: Fix memory corruption risk in snd_ctl_elem_read (diff)
downloadlinux-350144069abf351c743d766b2fba9cb9b7cd32a1.tar.xz
linux-350144069abf351c743d766b2fba9cb9b7cd32a1.zip
ALSA: x86: Fix missing spinlock and mutex initializations
The commit change for supporting the multiple ports moved involved some code shuffling, and there the initializations of spinlock and mutex in snd_intelhad object were dropped mistakenly. This patch adds the missing initializations again for each port. Fixes: b4eb0d522fcb ("ALSA: x86: Split snd_intelhad into card and PCM specific structures") Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/x86/intel_hdmi_audio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index 96115c401292..cec62f9b7085 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -1835,6 +1835,8 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
ctx->port = single_port ? -1 : port;
ctx->pipe = -1;
+ spin_lock_init(&ctx->had_spinlock);
+ mutex_init(&ctx->mutex);
INIT_WORK(&ctx->hdmi_audio_wq, had_audio_wq);
ret = snd_pcm_new(card, INTEL_HAD, port, MAX_PB_STREAMS,