OSDN Git Service

net: macb: unprepare clocks in case of failure
authorClaudiu Beznea <claudiu.beznea@microchip.com>
Wed, 9 Dec 2020 13:03:35 +0000 (15:03 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Dec 2020 00:19:21 +0000 (16:19 -0800)
Unprepare clocks in case of any failure in fu540_c000_clk_init().

Fixes: c218ad559020 ("macb: Add support for SiFive FU540-C000")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb_main.c

index 8170498..11bf4f8 100644 (file)
@@ -4420,8 +4420,10 @@ static int fu540_c000_clk_init(struct platform_device *pdev, struct clk **pclk,
                return err;
 
        mgmt = devm_kzalloc(&pdev->dev, sizeof(*mgmt), GFP_KERNEL);
-       if (!mgmt)
-               return -ENOMEM;
+       if (!mgmt) {
+               err = -ENOMEM;
+               goto err_disable_clks;
+       }
 
        init.name = "sifive-gemgxl-mgmt";
        init.ops = &fu540_c000_ops;
@@ -4432,16 +4434,26 @@ static int fu540_c000_clk_init(struct platform_device *pdev, struct clk **pclk,
        mgmt->hw.init = &init;
 
        *tx_clk = devm_clk_register(&pdev->dev, &mgmt->hw);
-       if (IS_ERR(*tx_clk))
-               return PTR_ERR(*tx_clk);
+       if (IS_ERR(*tx_clk)) {
+               err = PTR_ERR(*tx_clk);
+               goto err_disable_clks;
+       }
 
        err = clk_prepare_enable(*tx_clk);
-       if (err)
+       if (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);
+       }
 
        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)