diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/oss/au1550_ac97.c | 12 | ||||
-rw-r--r-- | sound/soc/au1x/dbdma2.c | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index 4191acccbcdb..b9ff0b798032 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c | |||
@@ -614,7 +614,8 @@ start_adc(struct au1550_state *s) | |||
614 | /* Put two buffers on the ring to get things started. | 614 | /* Put two buffers on the ring to get things started. |
615 | */ | 615 | */ |
616 | for (i=0; i<2; i++) { | 616 | for (i=0; i<2; i++) { |
617 | au1xxx_dbdma_put_dest(db->dmanr, db->nextIn, db->dma_fragsize); | 617 | au1xxx_dbdma_put_dest(db->dmanr, db->nextIn, |
618 | db->dma_fragsize, DDMA_FLAGS_IE); | ||
618 | 619 | ||
619 | db->nextIn += db->dma_fragsize; | 620 | db->nextIn += db->dma_fragsize; |
620 | if (db->nextIn >= db->rawbuf + db->dmasize) | 621 | if (db->nextIn >= db->rawbuf + db->dmasize) |
@@ -733,7 +734,7 @@ static void dac_dma_interrupt(int irq, void *dev_id) | |||
733 | 734 | ||
734 | if (db->count >= db->fragsize) { | 735 | if (db->count >= db->fragsize) { |
735 | if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, | 736 | if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, |
736 | db->fragsize) == 0) { | 737 | db->fragsize, DDMA_FLAGS_IE) == 0) { |
737 | err("qcount < 2 and no ring room!"); | 738 | err("qcount < 2 and no ring room!"); |
738 | } | 739 | } |
739 | db->nextOut += db->fragsize; | 740 | db->nextOut += db->fragsize; |
@@ -777,7 +778,8 @@ static void adc_dma_interrupt(int irq, void *dev_id) | |||
777 | 778 | ||
778 | /* Put a new empty buffer on the destination DMA. | 779 | /* Put a new empty buffer on the destination DMA. |
779 | */ | 780 | */ |
780 | au1xxx_dbdma_put_dest(dp->dmanr, dp->nextIn, dp->dma_fragsize); | 781 | au1xxx_dbdma_put_dest(dp->dmanr, dp->nextIn, |
782 | dp->dma_fragsize, DDMA_FLAGS_IE); | ||
781 | 783 | ||
782 | dp->nextIn += dp->dma_fragsize; | 784 | dp->nextIn += dp->dma_fragsize; |
783 | if (dp->nextIn >= dp->rawbuf + dp->dmasize) | 785 | if (dp->nextIn >= dp->rawbuf + dp->dmasize) |
@@ -1177,8 +1179,8 @@ au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos) | |||
1177 | * we know the dma has stopped. | 1179 | * we know the dma has stopped. |
1178 | */ | 1180 | */ |
1179 | while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) { | 1181 | while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) { |
1180 | if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, | 1182 | if (au1xxx_dbdma_put_source(db->dmanr, |
1181 | db->fragsize) == 0) { | 1183 | db->nextOut, db->fragsize, DDMA_FLAGS_IE) == 0) { |
1182 | err("qcount < 2 and no ring room!"); | 1184 | err("qcount < 2 and no ring room!"); |
1183 | } | 1185 | } |
1184 | db->nextOut += db->fragsize; | 1186 | db->nextOut += db->fragsize; |
diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index 19e4d37eba1c..2929f1c42264 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c | |||
@@ -94,7 +94,7 @@ static const struct snd_pcm_hardware au1xpsc_pcm_hardware = { | |||
94 | 94 | ||
95 | static void au1x_pcm_queue_tx(struct au1xpsc_audio_dmadata *cd) | 95 | static void au1x_pcm_queue_tx(struct au1xpsc_audio_dmadata *cd) |
96 | { | 96 | { |
97 | au1xxx_dbdma_put_source_flags(cd->ddma_chan, | 97 | au1xxx_dbdma_put_source(cd->ddma_chan, |
98 | (void *)phys_to_virt(cd->dma_area), | 98 | (void *)phys_to_virt(cd->dma_area), |
99 | cd->period_bytes, DDMA_FLAGS_IE); | 99 | cd->period_bytes, DDMA_FLAGS_IE); |
100 | 100 | ||
@@ -109,9 +109,9 @@ static void au1x_pcm_queue_tx(struct au1xpsc_audio_dmadata *cd) | |||
109 | 109 | ||
110 | static void au1x_pcm_queue_rx(struct au1xpsc_audio_dmadata *cd) | 110 | static void au1x_pcm_queue_rx(struct au1xpsc_audio_dmadata *cd) |
111 | { | 111 | { |
112 | au1xxx_dbdma_put_dest_flags(cd->ddma_chan, | 112 | au1xxx_dbdma_put_dest(cd->ddma_chan, |
113 | (void *)phys_to_virt(cd->dma_area), | 113 | (void *)phys_to_virt(cd->dma_area), |
114 | cd->period_bytes, DDMA_FLAGS_IE); | 114 | cd->period_bytes, DDMA_FLAGS_IE); |
115 | 115 | ||
116 | /* update next-to-queue period */ | 116 | /* update next-to-queue period */ |
117 | ++cd->q_period; | 117 | ++cd->q_period; |