lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 1001/1157] serial: 8250_bcm2835aux: Add missing clk_disable_unprepare()
    Date
    From: Guo Mengqi <guomengqi3@huawei.com>

    [ 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 | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c
    index 2a1226a78a0c..21939bb44613 100644
    --- a/drivers/tty/serial/8250/8250_bcm2835aux.c
    +++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
    @@ -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,
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 06:53    [W:3.678 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site