Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-15 01:44:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: ti: Fix SDMA users not providing channel names

Browse Source 
McBSP used to work correctly as long as compat DMA probing, removed by
commit 642aafea8889 ("ASoC: ti: remove compat dma probing"), was
available.  New method of DMA probing apparently requires users to
provide channel names when registering with SDMA, while McBSP passes
NULLs.  Fix it.

The same probably applies to McASP (not tested), hence the patch fixes
both.

Fixes: 642aafea8889 ("ASoC: ti: remove compat dma probing")
Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Janusz Krzysztofik 2019-06-02 16:55:49 +02:00 committed by Mark Brown
parent 489f231e0f
commit 3e802e90ff
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/ti/davinci-mcasp.c
View File

@ -2237,7 +2237,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
ret = edma_pcm_platform_register(&pdev->dev);
break;
case PCM_SDMA:
ret = sdma_pcm_platform_register(&pdev->dev, NULL, NULL);
ret = sdma_pcm_platform_register(&pdev->dev, "tx", "rx");
break;
default:
dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret);

2
sound/soc/ti/omap-mcbsp.c
View File

@ -1438,7 +1438,7 @@ static int asoc_mcbsp_probe(struct platform_device *pdev)
if (ret)
return ret;
return sdma_pcm_platform_register(&pdev->dev, NULL, NULL);
return sdma_pcm_platform_register(&pdev->dev, "tx", "rx");
}
static int asoc_mcbsp_remove(struct platform_device *pdev)