lkml.org 
[lkml]   [2019]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 020/162] spi: pxa2xx: Balance runtime PM enable/disable on error
    Date
    [ Upstream commit 1274204542f683e1d8491ebe9cc86284d5a8ebcc ]

    Don't undo the PM initialization if we error out before we managed to
    initialize it. The call to pm_runtime_disable() without being preceded
    by pm_runtime_enable() would disturb the balance of the Force.

    In practice, this happens if we fail to allocate any of the GPIOS ("cs",
    "ready") due to -EPROBE_DEFER because we're getting probled before the
    GPIO driver.

    Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
    Link: https://lore.kernel.org/r/20190719122713.3444318-1-lkundrak@v3.sk
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-pxa2xx.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
    index af3f37ba82c83..c1af8887d9186 100644
    --- a/drivers/spi/spi-pxa2xx.c
    +++ b/drivers/spi/spi-pxa2xx.c
    @@ -1817,14 +1817,16 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
    status = devm_spi_register_controller(&pdev->dev, controller);
    if (status != 0) {
    dev_err(&pdev->dev, "problem registering spi controller\n");
    - goto out_error_clock_enabled;
    + goto out_error_pm_runtime_enabled;
    }

    return status;

    -out_error_clock_enabled:
    +out_error_pm_runtime_enabled:
    pm_runtime_put_noidle(&pdev->dev);
    pm_runtime_disable(&pdev->dev);
    +
    +out_error_clock_enabled:
    clk_disable_unprepare(ssp->clk);

    out_error_dma_irq_alloc:
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-08-27 10:11    [W:4.054 / U:1.476 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site