Commit e0cfb41d authored Feb 28, 2022 by Jiasheng Jiang Committed by Greg Kroah-Hartman Apr 15, 2022

ASoC: ti: davinci-i2s: Add check for clk_enable()



[ Upstream commit ed7c9fef11931fc5d32a83d68017ff390bf5c280 ]

As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.

Fixes: 5f9a50c3 ("ASoC: Davinci: McBSP: add device tree support for McBSP")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Link: https://lore.kernel.org/r/20220228031540.3571959-1-jiasheng@iscas.ac.cn


Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 3905742f

sound/soc/ti/davinci-i2s.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -708,7 +708,9 @@ static int davinci_i2s_probe(struct platform_device *pdev)
		dev->clk = clk_get(&pdev->dev, NULL);
		if (IS_ERR(dev->clk))
		return -ENODEV;
		clk_enable(dev->clk);
		ret = clk_enable(dev->clk);
		if (ret)
		goto err_put_clk;

		dev->dev = &pdev->dev;
		dev_set_drvdata(&pdev->dev, dev);
		@@ -730,6 +732,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
		snd_soc_unregister_component(&pdev->dev);
		err_release_clk:
		clk_disable(dev->clk);
		err_put_clk:
		clk_put(dev->clk);
		return ret;
		}