diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:24 +0100 |
| commit | 0dceaf7c798de953c74073cc77be40b7be49abbc (patch) | |
| tree | 8014fcd5783090ced8024d71d3d943676033af8e /sound/soc/ti/davinci-mcasp.c | |
| parent | 6fbc7275c7a9ba97877050335f290341a1fd8dbf (diff) | |
| parent | 1bcc1fd64e4dd903f4d868a9e053986e3b102713 (diff) | |
| download | linux-0dceaf7c798de953c74073cc77be40b7be49abbc.tar.bz2 | |
Merge branch 'asoc-5.2' into asoc-linus
Diffstat (limited to 'sound/soc/ti/davinci-mcasp.c')
| -rw-r--r-- | sound/soc/ti/davinci-mcasp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 5e8e31743a28..29ca88ba3746 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -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); |