lkml.org 
[lkml]   [2021]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 27/36] dmaengine: tegra20: Fix runtime PM imbalance on error
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit 917a3200b9f467a154999c7572af345f2470aaf4 ]

    pm_runtime_get_sync() will increase the runtime PM counter
    even it returns an error. Thus a pairing decrement is needed
    to prevent refcount leak. Fix this by replacing this API with
    pm_runtime_resume_and_get(), which will not change the runtime
    PM counter on error.

    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Acked-by: Thierry Reding <treding@nvidia.com>
    Link: https://lore.kernel.org/r/20210409082805.23643-1-dinghao.liu@zju.edu.cn
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/tegra20-apb-dma.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
    index 71827d9b0aa1..b7260749e8ee 100644
    --- a/drivers/dma/tegra20-apb-dma.c
    +++ b/drivers/dma/tegra20-apb-dma.c
    @@ -723,7 +723,7 @@ static void tegra_dma_issue_pending(struct dma_chan *dc)
    goto end;
    }
    if (!tdc->busy) {
    - err = pm_runtime_get_sync(tdc->tdma->dev);
    + err = pm_runtime_resume_and_get(tdc->tdma->dev);
    if (err < 0) {
    dev_err(tdc2dev(tdc), "Failed to enable DMA\n");
    goto end;
    @@ -818,7 +818,7 @@ static void tegra_dma_synchronize(struct dma_chan *dc)
    struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
    int err;

    - err = pm_runtime_get_sync(tdc->tdma->dev);
    + err = pm_runtime_resume_and_get(tdc->tdma->dev);
    if (err < 0) {
    dev_err(tdc2dev(tdc), "Failed to synchronize DMA: %d\n", err);
    return;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-04-26 09:53    [W:2.218 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site