summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrygorii Strashko <Grygorii.Strashko@linaro.org>2015-01-20 18:03:44 +0200
committerGrygorii Strashko <Grygorii.Strashko@linaro.org>2015-02-09 23:28:43 +0800
commit8cb861afdc18ca2b9b7e200e72c5b72b9b5b9704 (patch)
treee0dddbd475b4e870603e20c55445986f8defeabc
parentf0ccb40c692b4eb433c5867188ab834dd5fe0ed6 (diff)
[boot-fix-ti] ASOC: omap-prcm: fix dma_mask setting
The omap_pcm_new() will try configure dma_mask=64bit and fail with code =-EIO in case OMAP PCM platfrom is used (omap_pcm_platform_register()). Fix it by switching back to dma_mask=32bit when dma_mask=64bit isn't supported. Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org>
-rw-r--r--sound/soc/omap/omap-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index 8d809f8509c..015cedf1bbb 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)
int ret;
ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(64));
- if (ret)
+ if (ret && dma_set_mask_and_coherent(card->dev, DMA_BIT_MASK(32)))
return ret;
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {