]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: gemini: Fix missing clk_disable_unprepare() in error path of gemini_ethernet_por...
authorWang Hai <wanghai38@huawei.com>
Thu, 30 Jul 2020 07:30:00 +0000 (15:30 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Aug 2020 07:58:47 +0000 (09:58 +0200)
[ Upstream commit 85496a29224188051b6135eb38da8afd4c584765 ]

Fix the missing clk_disable_unprepare() before return
from gemini_ethernet_port_probe() in the error handling case.

Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/cortina/gemini.c

index 5bff5c2be88b984b5373d162c361e8eb35b59214..5359fb40578dbc441fc5b6b16e82f0c12055f07c 100644 (file)
@@ -2445,6 +2445,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
        port->reset = devm_reset_control_get_exclusive(dev, NULL);
        if (IS_ERR(port->reset)) {
                dev_err(dev, "no reset\n");
+               clk_disable_unprepare(port->pclk);
                return PTR_ERR(port->reset);
        }
        reset_control_reset(port->reset);
@@ -2500,8 +2501,10 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
                                        IRQF_SHARED,
                                        port_names[port->id],
                                        port);
-       if (ret)
+       if (ret) {
+               clk_disable_unprepare(port->pclk);
                return ret;
+       }
 
        ret = register_netdev(netdev);
        if (!ret) {