ALSA: cs5535audio: correctly set dma->substream
Subsystems (2)
PATCH 1/5 ALSA: cs5535audio: correctly set dma->substream
We're never actually setting dma->substream to the current substream; that means the dma->substream checks that we do in the suspend/resume path are never satisfied, and the PRD registers are never correctly managed. This changes it so that we set the substream when constructing the specific bus master DMA, and unsetting it when we tear down the BM's DMA.
---
sound/pci/cs5535audio/cs5535audio_pcm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
sound/pci/cs5535audio/cs5535audio_pcm.c +2 -0
@@ -164,6 +164,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au, jmpprd_addr =cpu_to_le32 (lastdesc->addr + (sizeof (struct cs5535audio_dma_desc )*periods)); + dma->substream = substream; dma->period_bytes = period_bytes; dma->periods = periods;spin_lock_irq (&cs5535au->reg_lock);
@@ -241,6 +242,7 @@ static void cs5535audio_clear_dma_packets(struct cs5535audio *cs5535au, {snd_dma_free_pages (&dma->desc_buf); dma->desc_buf.area =NULL ; + dma->substream =NULL ; } static int snd_cs5535audio_hw_params(struct snd_pcm_substream *substream,
Quoted 8 lines · Andres Salomon
We're never actually setting
dma->substreamto the current substream; that means thedma->substreamchecks that we do in the suspend/resume path are never satisfied, and the PRD registers are never correctly managed. This changes it so that we set the substream when constructing the specific bus master DMA, and unsetting it when we tear down the BM's DMA.Signed-off-by Andres Salomon <[email protected]>
Quoted 27 lines
---
sound/pci/cs5535audio/cs5535audio_pcm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)sound/pci/cs5535audio/cs5535audio_pcm.c +2
-0@@ -164,6 +164,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au, jmpprd_addr =cpu_to_le32 (lastdesc->addr + (sizeof (struct cs5535audio_dma_desc )*periods)); + dma->substream = substream; dma->period_bytes = period_bytes; dma->periods = periods;spin_lock_irq (&cs5535au->reg_lock);@@ -241,6 +242,7 @@ static void cs5535audio_clear_dma_packets(struct cs5535audio *cs5535au, {snd_dma_free_pages (&dma->desc_buf); dma->desc_buf.area =NULL ; + dma->substream =NULL ; } static int snd_cs5535audio_hw_params(struct snd_pcm_substream *substream,
Signature · 3 lines
Jordan Crouse Systems Software Development Engineer Advanced Micro Devices, Inc.