diff options
| author | Mark Brown | 2019-07-06 13:25:24 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-07-06 13:25:24 +0200 |
| commit | 0dceaf7c798de953c74073cc77be40b7be49abbc (patch) | |
| tree | 8014fcd5783090ced8024d71d3d943676033af8e /sound/soc/ti | |
| parent | Linux 5.2-rc7 (diff) | |
| parent | ASoC: audio-graph-card: fix use-after-free in graph_for_each_link (diff) | |
| download | kernel-qcow2-linux-0dceaf7c798de953c74073cc77be40b7be49abbc.tar.gz kernel-qcow2-linux-0dceaf7c798de953c74073cc77be40b7be49abbc.tar.xz kernel-qcow2-linux-0dceaf7c798de953c74073cc77be40b7be49abbc.zip | |
Merge branch 'asoc-5.2' into asoc-linus
Diffstat (limited to 'sound/soc/ti')
| -rw-r--r-- | sound/soc/ti/davinci-mcasp.c | 2 | ||||
| -rw-r--r-- | sound/soc/ti/omap-mcbsp.c | 2 |
2 files changed, 2 insertions, 2 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); diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 1ab3c7df4f8b..26b503bbdb5f 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -1424,7 +1424,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) |