diff options
| author | Andres Salomon <dilinger@debian.org> | 2007-09-03 15:41:47 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 15:59:51 +0200 |
| commit | 7abcacb09ac0f9c6848f1e7d86b284427fa83cee (patch) | |
| tree | 2447fe6c1c731b177dedf74a382c61214c0b3017 /sound/pci/cs5535audio | |
| parent | 9e05b7a3d936ac5eb6c10291b69aee0af1ad03fb (diff) | |
| download | linux-3.10-7abcacb09ac0f9c6848f1e7d86b284427fa83cee.tar.gz linux-3.10-7abcacb09ac0f9c6848f1e7d86b284427fa83cee.tar.bz2 linux-3.10-7abcacb09ac0f9c6848f1e7d86b284427fa83cee.zip | |
[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.
Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/cs5535audio')
| -rw-r--r-- | sound/pci/cs5535audio/cs5535audio_pcm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c index ec920cbb2a7..9a1e87fd481 100644 --- a/sound/pci/cs5535audio/cs5535audio_pcm.c +++ b/sound/pci/cs5535audio/cs5535audio_pcm.c @@ -161,6 +161,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); @@ -238,6 +239,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, |