Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.33
This commit is contained in:
commit
1452556beb
1 changed files with 2 additions and 2 deletions
|
@ -423,7 +423,7 @@ static void s6000_pcm_free(struct snd_pcm *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,
|
||||
struct snd_soc_dai *dai, struct snd_pcm *pcm)
|
||||
|
@ -435,7 +435,7 @@ static int s6000_pcm_new(struct snd_card *card,
|
|||
if (!card->dev->dma_mask)
|
||||
card->dev->dma_mask = &s6000_pcm_dmamask;
|
||||
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) {
|
||||
s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in),
|
||||
|
|
Reference in a new issue