Skip to contentSkip to conversation

ASoC: tegra-ac97: Do common and clock init prior to component registration

PATCH In review Mark Brown 2 participants 2 messages Jun 26, 2013 1 message not in the archive

Subsystems (3)
Sound ASoC Tegra architecture support
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ASoC: tegra-ac97: Do common and clock init prior to component registration

From: Mark Brown <[email protected]>

Otherwise we may instantiate and hence have something try to access the device while it is still completing initialisation.

Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/tegra/tegra20_ac97.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)
sound/soc/tegra/tegra20_ac97.c +17 -17
index 9043626d..48037f7 100644
@@ -395,23 +395,9 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
 	ac97->capture_dma_data.maxburst = 4;
 	ac97->capture_dma_data.slave_id = of_dma[0];
 
-	ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
-					 &tegra20_ac97_dai, 1);
-	if (ret) {
-		dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
-		ret = -ENOMEM;
-		goto err_clk_put;
-	}
-
-	ret = tegra_pcm_platform_register(&pdev->dev);
-	if (ret) {
-		dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-		goto err_unregister_component;
-	}
-
 	ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev);
 	if (ret)
-		goto err_unregister_pcm;
+		goto err_clk_put;
 
 	ret = tegra_asoc_utils_set_ac97_rate(&ac97->util_data);
 	if (ret)

@@ -423,17 +409,31 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
 		goto err_asoc_utils_fini;
 	}
 
+	ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
+					 &tegra20_ac97_dai, 1);
+	if (ret) {
+		dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
+		ret = -ENOMEM;
+		goto err_asoc_utils_fini;
+	}
+
+	ret = tegra_pcm_platform_register(&pdev->dev);
+	if (ret) {
+		dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
+		goto err_unregister_component;
+	}
+
 	/* XXX: crufty ASoC AC97 API - only one AC97 codec allowed */
 	workdata = ac97;
 
 	return 0;
 
-err_asoc_utils_fini:
-	tegra_asoc_utils_fini(&ac97->util_data);
 err_unregister_pcm:
 	tegra_pcm_platform_unregister(&pdev->dev);
 err_unregister_component:
 	snd_soc_unregister_component(&pdev->dev);
+err_asoc_utils_fini:
+	tegra_asoc_utils_fini(&ac97->util_data);
 err_clk_put:
 err:
 	return ret;
Signature · 1 line
1.8.3.1

A message that is not in the archive (sent off-list or not yet received): 1372246111-15781-1-git-send-email-broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org

Acked-by
#2 lore raw
Quoted 4 lines · Mark Brown

From: Mark Brown <[email protected]>

Otherwise we may instantiate and hence have something try to access the device while it is still completing initialisation.

One question below, otherwise,

Acked-by Stephen Warren <[email protected]>

sound/soc/tegra/tegra20_ac97.c static int tegra20_ac97_platform_probe(struct platform_device *pdev) · line 439

Quoted 4 lines
sound/soc/tegra/tegra20_ac97.c +0 -0
 err_clk_put:
 err:
 	return ret;

Right after the err_clk_put label there's a clk_put(ac97->clk_ac97) in my copy, and in the ASoC for-next branch. When did that get removed?