diff options
| author | Mark Brown <broonie@kernel.org> | 2019-02-26 17:22:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-26 17:22:47 +0100 |
| commit | 3146089d235b304e665dc551472ae9cb9ab58572 (patch) | |
| tree | d1a9141c302f269cb8468f0d4de78124ea5e389a /sound/soc/samsung/s3c2412-i2s.c | |
| parent | Merge branch 'asoc-5.0' into asoc-linus (diff) | |
| parent | ASoC: stm32: i2s: skip useless write in slave mode (diff) | |
| download | linux-3146089d235b304e665dc551472ae9cb9ab58572.tar.xz linux-3146089d235b304e665dc551472ae9cb9ab58572.zip | |
Merge branch 'asoc-5.1' into asoc-next
Diffstat (limited to 'sound/soc/samsung/s3c2412-i2s.c')
| -rw-r--r-- | sound/soc/samsung/s3c2412-i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index cc0840fff5aa..c08638b0e458 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -177,7 +177,7 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) ret = samsung_asoc_dma_platform_register(&pdev->dev, pdata->dma_filter, - NULL, NULL); + "tx", "rx", NULL); if (ret) { pr_err("failed to register the DMA: %d\n", ret); return ret; |