]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: omap-pcm: Correct dma mask
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 3 Mar 2015 11:38:14 +0000 (13:38 +0200)
committerLuis Henriques <luis.henriques@canonical.com>
Wed, 18 Mar 2015 15:07:04 +0000 (15:07 +0000)
commit d51199a83a2cf82a291d19ee852c44caa511427d upstream.

DMA_BIT_MASK of 64 is not valid dma address mask for OMAPs, it should be
set to 32.
The 64 was introduced by commit (in 2009):
a152ff24b978 ASoC: OMAP: Make DMA 64 aligned

But the dma_mask and coherent_dma_mask can not be used to specify alignment.

Fixes: a152ff24b978 (ASoC: OMAP: Make DMA 64 aligned)
Reported-by: Grygorii Strashko <Grygorii.Strashko@linaro.org>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
sound/soc/omap/omap-pcm.c

index 8d809f8509c8e8867a0ddfb28e46d423dd71c19e..25ef4919813df421f6e17493f6772ee52b4b83a3 100644 (file)
@@ -200,7 +200,7 @@ static int omap_pcm_new(struct snd_soc_pcm_runtime *rtd)
        struct snd_pcm *pcm = rtd->pcm;
        int ret;
 
-       ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(64));
+       ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));
        if (ret)
                return ret;