Commit f4de93f0 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by David S. Miller

net: macb: unprepare clocks in case of failure

Unprepare clocks in case of any failure in fu540_c000_clk_init().

Fixes: c218ad55 ("macb: Add support for SiFive FU540-C000")
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38493da4
...@@ -4420,8 +4420,10 @@ static int fu540_c000_clk_init(struct platform_device *pdev, struct clk **pclk, ...@@ -4420,8 +4420,10 @@ static int fu540_c000_clk_init(struct platform_device *pdev, struct clk **pclk,
return err; return err;
mgmt = devm_kzalloc(&pdev->dev, sizeof(*mgmt), GFP_KERNEL); mgmt = devm_kzalloc(&pdev->dev, sizeof(*mgmt), GFP_KERNEL);
if (!mgmt) if (!mgmt) {
return -ENOMEM; err = -ENOMEM;
goto err_disable_clks;
}
init.name = "sifive-gemgxl-mgmt"; init.name = "sifive-gemgxl-mgmt";
init.ops = &fu540_c000_ops; init.ops = &fu540_c000_ops;
...@@ -4432,16 +4434,26 @@ static int fu540_c000_clk_init(struct platform_device *pdev, struct clk **pclk, ...@@ -4432,16 +4434,26 @@ static int fu540_c000_clk_init(struct platform_device *pdev, struct clk **pclk,
mgmt->hw.init = &init; mgmt->hw.init = &init;
*tx_clk = devm_clk_register(&pdev->dev, &mgmt->hw); *tx_clk = devm_clk_register(&pdev->dev, &mgmt->hw);
if (IS_ERR(*tx_clk)) if (IS_ERR(*tx_clk)) {
return PTR_ERR(*tx_clk); err = PTR_ERR(*tx_clk);
goto err_disable_clks;
}
err = clk_prepare_enable(*tx_clk); err = clk_prepare_enable(*tx_clk);
if (err) if (err) {
dev_err(&pdev->dev, "failed to enable tx_clk (%u)\n", err); dev_err(&pdev->dev, "failed to enable tx_clk (%u)\n", err);
else *tx_clk = NULL;
goto err_disable_clks;
} else {
dev_info(&pdev->dev, "Registered clk switch '%s'\n", init.name); dev_info(&pdev->dev, "Registered clk switch '%s'\n", init.name);
}
return 0; return 0;
err_disable_clks:
macb_clks_disable(*pclk, *hclk, *tx_clk, *rx_clk, *tsu_clk);
return err;
} }
static int fu540_c000_init(struct platform_device *pdev) static int fu540_c000_init(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment