summaryrefslogtreecommitdiff
path: root/sound/soc/samsung/idma.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/samsung/idma.c')
-rw-r--r--sound/soc/samsung/idma.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c
index e4f318f..ce1e1e1 100644
--- a/sound/soc/samsung/idma.c
+++ b/sound/soc/samsung/idma.c
@@ -383,15 +383,18 @@ static int preallocate_idma_buffer(struct snd_pcm *pcm, int stream)
return 0;
}
+static u64 idma_mask = DMA_BIT_MASK(32);
+
static int idma_new(struct snd_soc_pcm_runtime *rtd)
{
struct snd_card *card = rtd->card->snd_card;
struct snd_pcm *pcm = rtd->pcm;
- int ret;
+ int ret = 0;
- ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));
- if (ret)
- return ret;
+ if (!card->dev->dma_mask)
+ card->dev->dma_mask = &idma_mask;
+ if (!card->dev->coherent_dma_mask)
+ card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
ret = preallocate_idma_buffer(pcm,