Skip to contentSkip to conversation

ASoC: Intel: sof-rt5682: add a check for devm_clk_get

PATCH In review Chuhong Yuan 3 participants 3 messages Oct 17, 2019 – Oct 18, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: Intel: sof-rt5682: add a check for devm_clk_get

sof_audio_probe misses a check for devm_clk_get and may cause problems. Add a check for it to fix the bug.

---
 sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++
 1 file changed, 9 insertions(+)
sound/soc/intel/boards/sof_rt5682.c +9 -0
index a437567b8cee..6d15c7ff66bf 100644
@@ -576,6 +576,15 @@ static int sof_audio_probe(struct platform_device *pdev)
 	/* need to get main clock from pmc */
 	if (sof_rt5682_quirk & SOF_RT5682_MCLK_BYTCHT_EN) {
 		ctx->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");
+		if (IS_ERR(ctx->mclk)) {
+			ret = PTR_ERR(ctx->mclk);
+
+			dev_err(&pdev->dev,
+				"Failed to get MCLK from pmc_plt_clk_3: %d\n",
+				ret);
+			return ret;
+		}
+
 		ret = clk_prepare_enable(ctx->mclk);
 		if (ret < 0) {
 			dev_err(&pdev->dev,
Signature · 1 line
2.20.1
Acked-by on v1 1/1
#1 lore raw
Quoted 2 lines · Chuhong Yuan

sof_audio_probe misses a check for devm_clk_get and may cause problems. Add a check for it to fix the bug.

Indeed this is a miss, we have this test in all machine drivers except this one. Thanks for the patch!

Quoted 27 lines
---
  sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++
  1 file changed, 9 insertions(+)
sound/soc/intel/boards/sof_rt5682.c +9 -0
index a437567b8cee..6d15c7ff66bf 100644
@@ -576,6 +576,15 @@ static int sof_audio_probe(struct platform_device *pdev)
  	/* need to get main clock from pmc */
  	if (sof_rt5682_quirk & SOF_RT5682_MCLK_BYTCHT_EN) {
  		ctx->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");
+		if (IS_ERR(ctx->mclk)) {
+			ret = PTR_ERR(ctx->mclk);
+
+			dev_err(&pdev->dev,
+				"Failed to get MCLK from pmc_plt_clk_3: %d\n",
+				ret);
+			return ret;
+		}
+
  		ret = clk_prepare_enable(ctx->mclk);
  		if (ret < 0) {
  			dev_err(&pdev->dev,
maintainer
#2 lore raw

Applied "ASoC: Intel: sof-rt5682: add a check for devm_clk_get" to the asoc tree

In reply to Chuhong Yuan

The patch

ASoC: Intel: sof-rt5682: add a check for devm_clk_get

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

From e5f0d490fb718254a884453e47fcd48493cd67ea Mon Sep 17 00:00:00 2001
From: Chuhong Yuan <[email protected]>
Date: Thu, 17 Oct 2019 10:50:44 +0800
Subject: [PATCH] ASoC: Intel: sof-rt5682: add a check for devm_clk_get

sof_audio_probe misses a check for devm_clk_get and may cause problems. Add a check for it to fix the bug.

---
 sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++
 1 file changed, 9 insertions(+)
sound/soc/intel/boards/sof_rt5682.c +9 -0
index 5ce643d62faf..4f6e58c3954a 100644
@@ -603,6 +603,15 @@ static int sof_audio_probe(struct platform_device *pdev)
 	/* need to get main clock from pmc */
 	if (sof_rt5682_quirk & SOF_RT5682_MCLK_BYTCHT_EN) {
 		ctx->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");
+		if (IS_ERR(ctx->mclk)) {
+			ret = PTR_ERR(ctx->mclk);
+
+			dev_err(&pdev->dev,
+				"Failed to get MCLK from pmc_plt_clk_3: %d\n",
+				ret);
+			return ret;
+		}
+
 		ret = clk_prepare_enable(ctx->mclk);
 		if (ret < 0) {
 			dev_err(&pdev->dev,
Signature · 1 line
2.20.1