1 From 9692c07ee8bf8f68b74d553d861d092e33264781 Mon Sep 17 00:00:00 2001
2 From: Claudiu Beznea <claudiu.beznea@microchip.com>
3 Date: Wed, 9 Dec 2020 15:03:35 +0200
4 Subject: [PATCH 118/247] net: macb: unprepare clocks in case of failure
6 Unprepare clocks in case of any failure in fu540_c000_clk_init().
8 Fixes: c218ad559020 ("macb: Add support for SiFive FU540-C000")
9 Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
10 Signed-off-by: David S. Miller <davem@davemloft.net>
12 drivers/net/ethernet/cadence/macb_main.c | 24 ++++++++++++++++++------
13 1 file changed, 18 insertions(+), 6 deletions(-)
15 --- a/drivers/net/ethernet/cadence/macb_main.c
16 +++ b/drivers/net/ethernet/cadence/macb_main.c
17 @@ -4330,8 +4330,10 @@ static int fu540_c000_clk_init(struct pl
20 mgmt = devm_kzalloc(&pdev->dev, sizeof(*mgmt), GFP_KERNEL);
25 + goto err_disable_clks;
28 init.name = "sifive-gemgxl-mgmt";
29 init.ops = &fu540_c000_ops;
30 @@ -4342,16 +4344,26 @@ static int fu540_c000_clk_init(struct pl
31 mgmt->hw.init = &init;
33 *tx_clk = devm_clk_register(&pdev->dev, &mgmt->hw);
34 - if (IS_ERR(*tx_clk))
35 - return PTR_ERR(*tx_clk);
36 + if (IS_ERR(*tx_clk)) {
37 + err = PTR_ERR(*tx_clk);
38 + goto err_disable_clks;
41 err = clk_prepare_enable(*tx_clk);
44 dev_err(&pdev->dev, "failed to enable tx_clk (%u)\n", err);
47 + goto err_disable_clks;
49 dev_info(&pdev->dev, "Registered clk switch '%s'\n", init.name);
55 + macb_clks_disable(*pclk, *hclk, *tx_clk, *rx_clk, *tsu_clk);
60 static int fu540_c000_init(struct platform_device *pdev)