diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-14 08:28:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-14 08:28:30 +0100 |
| commit | 555a098af6086256bc64d3806519f37ccae936e0 (patch) | |
| tree | 4f13126483fc1202d23f1ba55045fac41d19118e /sound/soc/pxa/pxa2xx-pcm.c | |
| parent | d969135aae1434547f41853f0e8eaa622e8b8816 (diff) | |
| parent | f0d55cc1a65852e6647d4f5d707c1c9b5471ce3c (diff) | |
| download | op-kernel-dev-555a098af6086256bc64d3806519f37ccae936e0.zip op-kernel-dev-555a098af6086256bc64d3806519f37ccae936e0.tar.gz | |
Merge branch 'linus' into perf/urgent
Merge dependencies to apply a fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/soc/pxa/pxa2xx-pcm.c')
| -rw-r--r-- | sound/soc/pxa/pxa2xx-pcm.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 806da27..d58b09f 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -87,18 +87,15 @@ static struct snd_pcm_ops pxa2xx_pcm_ops = { .mmap = pxa2xx_pcm_mmap, }; -static u64 pxa2xx_pcm_dmamask = DMA_BIT_MASK(32); - static int pxa2xx_soc_pcm_new(struct snd_soc_pcm_runtime *rtd) { struct snd_card *card = rtd->card->snd_card; struct snd_pcm *pcm = rtd->pcm; - int ret = 0; + int ret; - if (!card->dev->dma_mask) - card->dev->dma_mask = &pxa2xx_pcm_dmamask; - if (!card->dev->coherent_dma_mask) - card->dev->coherent_dma_mask = DMA_BIT_MASK(32); + ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32)); + if (ret) + return ret; if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { ret = pxa2xx_pcm_preallocate_dma_buffer(pcm, |
