lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 217/717] serial: 8250-mtk: Fix reference leak in mtk8250_probe
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ Upstream commit 6e4e636e0e3e0b5deffc5e233adcb2cd4e68f2d0 ]

    The pm_runtime_enable will increase power disable depth.
    Thus a pairing decrement is needed on the error handling
    path to keep it balanced according to context.

    Fixes: e32a83c70cf98 ("serial: 8250-mtk: modify mtk uart power and clock management")
    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
    Link: https://lore.kernel.org/r/20201119141126.168850-1-zhangqilong3@huawei.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/tty/serial/8250/8250_mtk.c | 13 ++++++++++---
    1 file changed, 10 insertions(+), 3 deletions(-)

    diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
    index fa876e2c13e5d..f7d3023f860f0 100644
    --- a/drivers/tty/serial/8250/8250_mtk.c
    +++ b/drivers/tty/serial/8250/8250_mtk.c
    @@ -572,15 +572,22 @@ static int mtk8250_probe(struct platform_device *pdev)
    pm_runtime_enable(&pdev->dev);
    err = mtk8250_runtime_resume(&pdev->dev);
    if (err)
    - return err;
    + goto err_pm_disable;

    data->line = serial8250_register_8250_port(&uart);
    - if (data->line < 0)
    - return data->line;
    + if (data->line < 0) {
    + err = data->line;
    + goto err_pm_disable;
    + }

    data->rx_wakeup_irq = platform_get_irq_optional(pdev, 1);

    return 0;
    +
    +err_pm_disable:
    + pm_runtime_disable(&pdev->dev);
    +
    + return err;
    }

    static int mtk8250_remove(struct platform_device *pdev)
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:06    [W:3.631 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site