diff options
author | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
commit | 4aa5db22d35588e1a5d2ee88472348ea73d9fb23 (patch) | |
tree | 67c98488983a71305e24940930d6e27a96d54db2 /sound/soc/rockchip/rockchip_i2s.c | |
parent | Merge branch 'asoc-4.18' into asoc-linus (diff) | |
parent | ASoC: adav80x: mark expected switch fall-through (diff) | |
download | linux-dev-4aa5db22d35588e1a5d2ee88472348ea73d9fb23.tar.xz linux-dev-4aa5db22d35588e1a5d2ee88472348ea73d9fb23.zip |
Merge branch 'asoc-4.19' into asoc-next
Diffstat (limited to 'sound/soc/rockchip/rockchip_i2s.c')
-rw-r--r-- | sound/soc/rockchip/rockchip_i2s.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 950823d69e9c..60d43d53a8f5 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -22,6 +22,7 @@ #include <sound/dmaengine_pcm.h> #include "rockchip_i2s.h" +#include "rockchip_pcm.h" #define DRV_NAME "rockchip-i2s" @@ -674,7 +675,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) goto err_suspend; } - ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + ret = rockchip_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM\n"); return ret; |