ASoC: kirkwood: fix external clock probe defer (4523817d) · Commits · 戴 / test

When our call to get the external clock fails, we forget to clean up the enabled internal clock correctly. Enable the clock after we have obtained all our resources. Fixes: ("ASoC: kirkwood: fix loss of external clock at probe time") Signed-off-by:

Russell King <rmk+kernel@armlinux.org.uk> Link: https://lore.kernel.org/r/E1iNGyK-0004oF-6A@rmk-PC.armlinux.org.uk Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/kirkwood/kirkwood-i2s.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -555,10 +555,6 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
		return PTR_ERR(priv->clk);
		}

		err = clk_prepare_enable(priv->clk);
		if (err < 0)
		return err;

		priv->extclk = devm_clk_get(&pdev->dev, "extclk");
		if (IS_ERR(priv->extclk)) {
		if (PTR_ERR(priv->extclk) == -EPROBE_DEFER)
		@@ -574,6 +570,10 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
		}
		}

		err = clk_prepare_enable(priv->clk);
		if (err < 0)
		return err;

		/* Some sensible defaults - this reflects the powerup values */
		priv->ctl_play = KIRKWOOD_PLAYCTL_SIZE_24;
		priv->ctl_rec = KIRKWOOD_RECCTL_SIZE_24;

Admin message