Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332130
b: refs/heads/master
c: e512589
h: refs/heads/master
v: v3
  • Loading branch information
Peter Ujfalusi authored and Mark Brown committed Sep 22, 2012
1 parent e47a21a commit 69b80b6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dffb360e64968b95a0a0221ca52234a28cc049c9
refs/heads/master: e512589c17572e7498693a3e05eefa44e622f62b
7 changes: 6 additions & 1 deletion trunk/sound/soc/omap/omap-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,12 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream)
memset(&dma_params, 0, sizeof(dma_params));
dma_params.data_type = dma_data->data_type;
dma_params.trigger = dma_data->dma_req;
dma_params.sync_mode = dma_data->sync_mode;

if (dma_data->packet_size)
dma_params.sync_mode = OMAP_DMA_SYNC_PACKET;
else
dma_params.sync_mode = OMAP_DMA_SYNC_ELEMENT;

if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
dma_params.src_amode = OMAP_DMA_AMODE_POST_INC;
dma_params.dst_amode = OMAP_DMA_AMODE_CONSTANT;
Expand Down

0 comments on commit 69b80b6

Please sign in to comment.