Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

ALSA: atiixp: Fix unlocked snd_pcm_stop() call

snd_pcm_stop() must be called in the PCM substream lock context.

Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 12 years ago
parent
60478295d6
commit
cc7282b8d5
2 changed files with 4 additions and 0 deletions
Split View Show Diff Stats
  1. 2 0
      sound/pci/atiixp.c
  2. 2 0
      sound/pci/atiixp_modem.c

+ 2 - 0
sound/pci/atiixp.c
View File 

@@ -689,7 +689,9 @@ static void snd_atiixp_xrun_dma(struct atiixp *chip, struct atiixp_dma *dma)
 
 	if (! dma->substream || ! dma->running)
 
 		return;
 
 	snd_printdd("atiixp: XRUN detected (DMA %d)\n", dma->ops->type);
 
+	snd_pcm_stream_lock(dma->substream);
 
 	snd_pcm_stop(dma->substream, SNDRV_PCM_STATE_XRUN);
 
+	snd_pcm_stream_unlock(dma->substream);
 
 }
 
 
 /*

+ 2 - 0
sound/pci/atiixp_modem.c
View File 

@@ -638,7 +638,9 @@ static void snd_atiixp_xrun_dma(struct atiixp_modem *chip,
 
 	if (! dma->substream || ! dma->running)
 
 		return;
 
 	snd_printdd("atiixp-modem: XRUN detected (DMA %d)\n", dma->ops->type);
 
+	snd_pcm_stream_lock(dma->substream);
 
 	snd_pcm_stop(dma->substream, SNDRV_PCM_STATE_XRUN);
 
+	snd_pcm_stream_unlock(dma->substream);
 
 }
 
 
 /*