Merge branch 'asoc-5.2' into asoc-linus
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user