Skip to content

Commit

Permalink
fec: Check the return value from clk_prepare_enable()
Browse files Browse the repository at this point in the history
clk_prepare_enable() may fail, so let's check its return value and propagate it
in the case of error.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Fabio Estevam authored and David S. Miller committed Jul 22, 2013
1 parent 79820e7 commit 13a097b
Showing 1 changed file with 54 additions and 12 deletions.
66 changes: 54 additions & 12 deletions drivers/net/ethernet/freescale/fec_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2103,12 +2103,25 @@ fec_probe(struct platform_device *pdev)
fep->bufdesc_ex = 0;
}

clk_prepare_enable(fep->clk_ahb);
clk_prepare_enable(fep->clk_ipg);
if (fep->clk_enet_out)
clk_prepare_enable(fep->clk_enet_out);
if (fep->clk_ptp)
clk_prepare_enable(fep->clk_ptp);
ret = clk_prepare_enable(fep->clk_ahb);
if (ret)
goto failed_clk;

ret = clk_prepare_enable(fep->clk_ipg);
if (ret)
goto failed_clk_ipg;

if (fep->clk_enet_out) {
ret = clk_prepare_enable(fep->clk_enet_out);
if (ret)
goto failed_clk_enet_out;
}

if (fep->clk_ptp) {
ret = clk_prepare_enable(fep->clk_ptp);
if (ret)
goto failed_clk_ptp;
}

fep->reg_phy = devm_regulator_get(&pdev->dev, "phy");
if (!IS_ERR(fep->reg_phy)) {
Expand Down Expand Up @@ -2181,9 +2194,12 @@ fec_probe(struct platform_device *pdev)
failed_regulator:
if (fep->clk_ptp)
clk_disable_unprepare(fep->clk_ptp);
failed_clk_ptp:
if (fep->clk_enet_out)
clk_disable_unprepare(fep->clk_enet_out);
failed_clk_enet_out:
clk_disable_unprepare(fep->clk_ipg);
failed_clk_ipg:
clk_disable_unprepare(fep->clk_ahb);
failed_clk:
failed_ioremap:
Expand Down Expand Up @@ -2260,18 +2276,44 @@ fec_resume(struct device *dev)
return ret;
}

clk_prepare_enable(fep->clk_ahb);
clk_prepare_enable(fep->clk_ipg);
if (fep->clk_enet_out)
clk_prepare_enable(fep->clk_enet_out);
if (fep->clk_ptp)
clk_prepare_enable(fep->clk_ptp);
ret = clk_prepare_enable(fep->clk_ahb);
if (ret)
goto failed_clk_ahb;

ret = clk_prepare_enable(fep->clk_ipg);
if (ret)
goto failed_clk_ipg;

if (fep->clk_enet_out) {
ret = clk_prepare_enable(fep->clk_enet_out);
if (ret)
goto failed_clk_enet_out;
}

if (fep->clk_ptp) {
ret = clk_prepare_enable(fep->clk_ptp);
if (ret)
goto failed_clk_ptp;
}

if (netif_running(ndev)) {
fec_restart(ndev, fep->full_duplex);
netif_device_attach(ndev);
}

return 0;

failed_clk_ptp:
if (fep->clk_enet_out)
clk_disable_unprepare(fep->clk_enet_out);
failed_clk_enet_out:
clk_disable_unprepare(fep->clk_ipg);
failed_clk_ipg:
clk_disable_unprepare(fep->clk_ahb);
failed_clk_ahb:
if (fep->reg_phy)
regulator_disable(fep->reg_phy);
return ret;
}
#endif /* CONFIG_PM_SLEEP */

Expand Down

0 comments on commit 13a097b

Please sign in to comment.