diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-07-29 22:38:54 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-07-29 22:39:29 +0200 |
commit | 16c796e8fac353d736055322ca6a38ba3c49f5e2 (patch) | |
tree | a8557b6c660d067834ece2421a1d6ffe990b60af /sound/pci/cs5535audio/cs5535audio_pcm.c | |
parent | ALSA: hda/hdmi: Use single mutex unlock in error paths (diff) | |
parent | ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs (diff) | |
download | linux-dev-16c796e8fac353d736055322ca6a38ba3c49f5e2.tar.xz linux-dev-16c796e8fac353d736055322ca6a38ba3c49f5e2.zip |
Merge branch 'for-linus' into topic/virmidi
Pull the latest ALSA sequencer fixes for the further development of
virmidi.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/cs5535audio/cs5535audio_pcm.c')
-rw-r--r-- | sound/pci/cs5535audio/cs5535audio_pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c index ee7065f6e162..326caec854e1 100644 --- a/sound/pci/cs5535audio/cs5535audio_pcm.c +++ b/sound/pci/cs5535audio/cs5535audio_pcm.c @@ -158,8 +158,8 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au, lastdesc->addr = cpu_to_le32((u32) dma->desc_buf.addr); lastdesc->size = 0; lastdesc->ctlreserved = cpu_to_le16(PRD_JMP); - jmpprd_addr = cpu_to_le32(lastdesc->addr + - (sizeof(struct cs5535audio_dma_desc)*periods)); + jmpprd_addr = (u32)dma->desc_buf.addr + + sizeof(struct cs5535audio_dma_desc) * periods; dma->substream = substream; dma->period_bytes = period_bytes; |