diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-09 13:23:57 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-09 13:23:57 +0300 |
commit | 95a9ca74768089d89c17ba958d6f009aa9c18525 (patch) | |
tree | 513200c0d5255eb1918f64fc11417858b1539ebb /sound/soc/omap/omap-pcm.c | |
parent | 4e2576bd36a12e78ac3786d05b99a820dffe687f (diff) | |
parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
download | linux-95a9ca74768089d89c17ba958d6f009aa9c18525.tar.xz |
Merge tag 'v4.0-rc7' into asoc-core
Linux 4.0-rc7
Diffstat (limited to 'sound/soc/omap/omap-pcm.c')
-rw-r--r-- | sound/soc/omap/omap-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index f4b05bc23e4b..1343ecbf0bd5 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -201,7 +201,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; |