Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd61576f authored by Wei Yongjun's avatar Wei Yongjun Committed by Mark Brown
Browse files

ASoC: samsung: i2s: Add missing clk_disable_unprepare() on error in samsung_i2s_probe() 



Add the missing clk_disable_unprepare() before return
from samsung_i2s_probe() in the error handling case.

Signed-off-by: default avatarWei Yongjun <weiyj.lk@gmail.com>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 45ef4969

sound/soc/samsung/i2s.c

+6 −2
Original line number Diff line number Diff line
@@ -1318,7 +1318,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
		sec_dai = i2s_alloc_dai(pdev, true);

		if (!sec_dai) {

			dev_err(&pdev->dev, "Unable to alloc I2S_sec\n");

			return -ENOMEM;

			ret = -ENOMEM;

			goto err_disable_clk;

		}



		sec_dai->lock = &pri_dai->spinlock;
@@ -1342,7 +1343,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) 


	if (i2s_pdata && i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) {

		dev_err(&pdev->dev, "Unable to configure gpio\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err_disable_clk;

	}



	ret = devm_snd_soc_register_component(&pri_dai->pdev->dev,
@@ -1366,6 +1368,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
err_free_dai:

	if (sec_dai)

		i2s_free_sec_dai(sec_dai);

err_disable_clk:

	clk_disable_unprepare(pri_dai->clk);

	return ret;

}