]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
serial: 8250_bcm2835aux: Add missing clk_disable_unprepare()
authorGuo Mengqi <guomengqi3@huawei.com>
Fri, 15 Jul 2022 02:33:12 +0000 (10:33 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:42:12 +0000 (14:42 +0200)
[ Upstream commit b9f1736e475dba0d6da48fdcb831248ab1597886 ]

The error path when get clock frequency fails in bcm2835aux_serial
driver does not correctly disable the clock.

This flaw was found using a static analysis tool "Hulk Robot", which
reported the following warning when analyzing linux-next/master:

    drivers/tty/serial/8250/8250_bcm2835aux.c:
    warning: clk_disable_unprepare_missing.cocci

The cocci script checks for the existence of clk_disable_unprepare()
paired with clk_prepare_enable().

Add the missing clk_disable_unprepare() to the error path.

Fixes: fcc446c8aa63 ("serial: 8250_bcm2835aux: Add ACPI support")
Reported-by: Hulk Robot <hulkci@huawei.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Guo Mengqi <guomengqi3@huawei.com>
Link: https://lore.kernel.org/r/20220715023312.37808-1-guomengqi3@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/tty/serial/8250/8250_bcm2835aux.c

index 2a1226a78a0c26492ce26ada9e8e36c49b56da7c..21939bb44613e3e39bf00eae7e27b7f762b4262b 100644 (file)
@@ -166,8 +166,10 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev)
        uartclk = clk_get_rate(data->clk);
        if (!uartclk) {
                ret = device_property_read_u32(&pdev->dev, "clock-frequency", &uartclk);
-               if (ret)
-                       return dev_err_probe(&pdev->dev, ret, "could not get clk rate\n");
+               if (ret) {
+                       dev_err_probe(&pdev->dev, ret, "could not get clk rate\n");
+                       goto dis_clk;
+               }
        }
 
        /* the HW-clock divider for bcm2835aux is 8,