diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-07-07 09:28:47 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-07-07 09:28:47 +0200 |
commit | 8e89995c58644682302fe9e298a9e30ff38d01a1 (patch) | |
tree | efebb038c81d80c930fc1f52a398797ce8e20539 /sound/pci/cs5535audio/cs5535audio_pcm.c | |
parent | ALSA: hda - Add Realtek ALC269VC codec support (diff) | |
parent | ALSA: hda - Change all ADCs for dual-adc switching mode for Realtek (diff) | |
download | linux-8e89995c58644682302fe9e298a9e30ff38d01a1.tar.xz linux-8e89995c58644682302fe9e298a9e30ff38d01a1.zip |
Merge branch 'fix/hda' into topic/hda
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 f16bc8aad6ed..e083122ca55a 100644 --- a/sound/pci/cs5535audio/cs5535audio_pcm.c +++ b/sound/pci/cs5535audio/cs5535audio_pcm.c @@ -149,7 +149,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au, &((struct cs5535audio_dma_desc *) dma->desc_buf.area)[i]; desc->addr = cpu_to_le32(addr); desc->size = cpu_to_le32(period_bytes); - desc->ctlreserved = cpu_to_le32(PRD_EOP); + desc->ctlreserved = cpu_to_le16(PRD_EOP); desc_addr += sizeof(struct cs5535audio_dma_desc); addr += period_bytes; } @@ -157,7 +157,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au, lastdesc = &((struct cs5535audio_dma_desc *) dma->desc_buf.area)[periods]; lastdesc->addr = cpu_to_le32((u32) dma->desc_buf.addr); lastdesc->size = 0; - lastdesc->ctlreserved = cpu_to_le32(PRD_JMP); + lastdesc->ctlreserved = cpu_to_le16(PRD_JMP); jmpprd_addr = cpu_to_le32(lastdesc->addr + (sizeof(struct cs5535audio_dma_desc)*periods)); |