mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-16 00:34:20 +08:00
ASoC: ti: davinci-i2s: Add check for clk_enable()
[ Upstream commited7c9fef11
] As the potential failure of the clk_enable(), it should be better to check it and return error if fails. Fixes:5f9a50c3e5
("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>
This commit is contained in:
parent
0a96bff46a
commit
89676d9e8c
@ -708,7 +708,9 @@ static int davinci_i2s_probe(struct platform_device *pdev)
|
|||||||
dev->clk = clk_get(&pdev->dev, NULL);
|
dev->clk = clk_get(&pdev->dev, NULL);
|
||||||
if (IS_ERR(dev->clk))
|
if (IS_ERR(dev->clk))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
clk_enable(dev->clk);
|
ret = clk_enable(dev->clk);
|
||||||
|
if (ret)
|
||||||
|
goto err_put_clk;
|
||||||
|
|
||||||
dev->dev = &pdev->dev;
|
dev->dev = &pdev->dev;
|
||||||
dev_set_drvdata(&pdev->dev, dev);
|
dev_set_drvdata(&pdev->dev, dev);
|
||||||
@ -730,6 +732,7 @@ err_unregister_component:
|
|||||||
snd_soc_unregister_component(&pdev->dev);
|
snd_soc_unregister_component(&pdev->dev);
|
||||||
err_release_clk:
|
err_release_clk:
|
||||||
clk_disable(dev->clk);
|
clk_disable(dev->clk);
|
||||||
|
err_put_clk:
|
||||||
clk_put(dev->clk);
|
clk_put(dev->clk);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user