xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.30' into for-2.6.31

Browse Source
This commit is contained in:
Mark Brown
2009-04-14 13:22:37 +01:00
parent 9b1a88c710 34e51ce60a
commit 6967963d6d
9702 changed files with 1023961 additions and 383588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/omap/omap-pcm.c
View File

@@ -327,7 +327,7 @@ 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_32BIT_MASK;
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
if (dai->playback.channels_min) {
ret = omap_pcm_preallocate_dma_buffer(pcm,