Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 157696
b: refs/heads/master
c: a152ff2
h: refs/heads/master
v: v3
  • Loading branch information
Eduardo Valentin authored and Mark Brown committed Aug 20, 2009
1 parent 667ba87 commit a38d033
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 9599d485cb0b5ea093414654d723f3ab03c95038
refs/heads/master: a152ff24b9784ddfd347953f23c53f0b890ebca8
4 changes: 2 additions & 2 deletions trunk/sound/soc/omap/omap-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ static struct snd_pcm_ops omap_pcm_ops = {
.mmap = omap_pcm_mmap,
};

static u64 omap_pcm_dmamask = DMA_BIT_MASK(32);
static u64 omap_pcm_dmamask = DMA_BIT_MASK(64);

static int omap_pcm_preallocate_dma_buffer(struct snd_pcm *pcm,
int stream)
Expand Down Expand Up @@ -360,7 +360,7 @@ static int omap_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
if (!card->dev->dma_mask)
card->dev->dma_mask = &omap_pcm_dmamask;
if (!card->dev->coherent_dma_mask)
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
card->dev->coherent_dma_mask = DMA_BIT_MASK(64);

if (dai->playback.channels_min) {
ret = omap_pcm_preallocate_dma_buffer(pcm,
Expand Down

0 comments on commit a38d033

Please sign in to comment.