Merge branch 'asoc-5.2' into asoc-linus

This commit is contained in:
Mark Brown
2019-07-06 12:25:24 +01:00
16 changed files with 91 additions and 29 deletions

View File

@@ -2234,7 +2234,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);