Commit 1452556b authored by Mark Brown's avatar Mark Brown

Merge branch 'topic/asoc' of...

Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.33
parents 57512c64 f9ede4ec
...@@ -423,7 +423,7 @@ static void s6000_pcm_free(struct snd_pcm *pcm) ...@@ -423,7 +423,7 @@ static void s6000_pcm_free(struct snd_pcm *pcm)
snd_pcm_lib_preallocate_free_for_all(pcm); snd_pcm_lib_preallocate_free_for_all(pcm);
} }
static u64 s6000_pcm_dmamask = DMA_32BIT_MASK; static u64 s6000_pcm_dmamask = DMA_BIT_MASK(32);
static int s6000_pcm_new(struct snd_card *card, static int s6000_pcm_new(struct snd_card *card,
struct snd_soc_dai *dai, struct snd_pcm *pcm) struct snd_soc_dai *dai, struct snd_pcm *pcm)
...@@ -435,7 +435,7 @@ static int s6000_pcm_new(struct snd_card *card, ...@@ -435,7 +435,7 @@ static int s6000_pcm_new(struct snd_card *card,
if (!card->dev->dma_mask) if (!card->dev->dma_mask)
card->dev->dma_mask = &s6000_pcm_dmamask; card->dev->dma_mask = &s6000_pcm_dmamask;
if (!card->dev->coherent_dma_mask) if (!card->dev->coherent_dma_mask)
card->dev->coherent_dma_mask = DMA_32BIT_MASK; card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
if (params->dma_in) { if (params->dma_in) {
s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in), s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment