lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 314/862] spi: cadence-quadspi: Fix PM disable depth imbalance in cqspi_probe
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ Upstream commit 4d0ef0a1c35189a6e8377d8ee8310ea5ef22c5f3 ]

    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:73d5fe0462702 ("spi: cadence-quadspi: Remove spi_master_put() in probe failure path")

    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
    Link: https://lore.kernel.org/r/20220924121310.78331-2-zhangqilong3@huawei.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-cadence-quadspi.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
    index e12ab5b43f34..447230547945 100644
    --- a/drivers/spi/spi-cadence-quadspi.c
    +++ b/drivers/spi/spi-cadence-quadspi.c
    @@ -1645,7 +1645,7 @@ static int cqspi_probe(struct platform_device *pdev)
    pm_runtime_enable(dev);
    ret = pm_runtime_resume_and_get(dev);
    if (ret < 0)
    - return ret;
    + goto probe_pm_failed;

    ret = clk_prepare_enable(cqspi->clk);
    if (ret) {
    @@ -1740,6 +1740,7 @@ static int cqspi_probe(struct platform_device *pdev)
    clk_disable_unprepare(cqspi->clk);
    probe_clk_failed:
    pm_runtime_put_sync(dev);
    +probe_pm_failed:
    pm_runtime_disable(dev);
    return ret;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:00    [W:2.559 / U:0.620 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site