diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 12:31:42 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 12:31:42 +0300 |
| commit | 7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec (patch) | |
| tree | dda57eb9683f421e9438effbdaf719adced18e3d /sound/soc/sunxi/sun4i-i2s.c | |
| parent | f74c2bb98776e2de508f4d607cd519873065118e (diff) | |
| parent | 48118a9323ab715358bf63f5172c5c2b8cf5f455 (diff) | |
| download | linux-7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec.tar.xz | |
Merge branch 'asoc-5.3' into asoc-linus
Diffstat (limited to 'sound/soc/sunxi/sun4i-i2s.c')
| -rw-r--r-- | sound/soc/sunxi/sun4i-i2s.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 7fa5c61169db..85c3b2c8cd77 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -1148,11 +1148,9 @@ static int sun4i_i2s_probe(struct platform_device *pdev) goto err_pm_disable; } - ret = devm_snd_soc_register_component(&pdev->dev, - &sun4i_i2s_component, - &sun4i_i2s_dai, 1); + ret = sun4i_i2s_init_regmap_fields(&pdev->dev, i2s); if (ret) { - dev_err(&pdev->dev, "Could not register DAI\n"); + dev_err(&pdev->dev, "Could not initialise regmap fields\n"); goto err_suspend; } @@ -1162,9 +1160,11 @@ static int sun4i_i2s_probe(struct platform_device *pdev) goto err_suspend; } - ret = sun4i_i2s_init_regmap_fields(&pdev->dev, i2s); + ret = devm_snd_soc_register_component(&pdev->dev, + &sun4i_i2s_component, + &sun4i_i2s_dai, 1); if (ret) { - dev_err(&pdev->dev, "Could not initialise regmap fields\n"); + dev_err(&pdev->dev, "Could not register DAI\n"); goto err_suspend; } |