Commit 4734dc96 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: kirkwood-i2s: Use devm_clk_get() for extclk 



Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 30d39248

sound/soc/kirkwood/kirkwood-i2s.c

+3 −8
Original line number Diff line number Diff line
@@ -498,10 +498,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) 
	if (err < 0)

		return err;



	priv->extclk = clk_get(&pdev->dev, "extclk");

	priv->extclk = devm_clk_get(&pdev->dev, "extclk");

	if (!IS_ERR(priv->extclk)) {

		if (priv->extclk == priv->clk) {

			clk_put(priv->extclk);

			priv->extclk = ERR_PTR(-EINVAL);

		} else {

			dev_info(&pdev->dev, "found external clock\n");
@@ -529,10 +528,8 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) 
		return 0;

	dev_err(&pdev->dev, "snd_soc_register_component failed\n");



	if (!IS_ERR(priv->extclk)) {

	if (!IS_ERR(priv->extclk))

		clk_disable_unprepare(priv->extclk);

		clk_put(priv->extclk);

	}

	clk_disable_unprepare(priv->clk);



	return err;
@@ -544,10 +541,8 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) 


	snd_soc_unregister_component(&pdev->dev);



	if (!IS_ERR(priv->extclk)) {

	if (!IS_ERR(priv->extclk))

		clk_disable_unprepare(priv->extclk);

		clk_put(priv->extclk);

	}

	clk_disable_unprepare(priv->clk);



	return 0;