NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: korina: handle clk prepare error in korina_probe()

Browse source 
[ Upstream commit 0b6291ad1940c403734312d0e453e8dac9148f69 ]

in korina_probe(), the return value of clk_prepare_enable()
should be checked since it might fail. we can use
devm_clk_get_optional_enabled() instead of devm_clk_get_optional()
and clk_prepare_enable() to automatically handle the error.

Fixes: e4cd854ec4 ("net: korina: Get mdio input clock via common clock framework")
Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
Link: https://lore.kernel.org/r/20230731090535.21416-1-ruc_gongyuanjun@163.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yuanjun Gong 2023-07-31 17:05:35 +08:00 • committed by Greg Kroah-Hartman
parent 58660666b4
commit 8afe27770d
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/ethernet/korina.c
View file

@ -1302,11 +1302,10 @@ static int korina_probe(struct platform_device *pdev)
else if (of_get_ethdev_address(pdev->dev.of_node, dev) < 0) else if (of_get_ethdev_address(pdev->dev.of_node, dev) < 0)
eth_hw_addr_random(dev); eth_hw_addr_random(dev);
clk = devm_clk_get_optional(&pdev->dev, "mdioclk"); clk = devm_clk_get_optional_enabled(&pdev->dev, "mdioclk");
if (IS_ERR(clk)) if (IS_ERR(clk))
return PTR_ERR(clk); return PTR_ERR(clk);
if (clk) { if (clk) {
clk_prepare_enable(clk);
lp->mii_clock_freq = clk_get_rate(clk); lp->mii_clock_freq = clk_get_rate(clk);
} else { } else {
lp->mii_clock_freq = 200000000; /* max possible input clk */ lp->mii_clock_freq = 200000000; /* max possible input clk */