Commit 8d728808 authored by Dinghao Liu's avatar Dinghao Liu Committed by Mark Brown

spi: spi-fsl-lpspi: Fix runtime PM imbalance on error

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced.
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Link: https://lore.kernel.org/r/20200523133859.5625-1-dinghao.liu@zju.edu.cnSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent c373643b
...@@ -940,7 +940,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) ...@@ -940,7 +940,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
ret = pm_runtime_get_sync(fsl_lpspi->dev); ret = pm_runtime_get_sync(fsl_lpspi->dev);
if (ret < 0) { if (ret < 0) {
dev_err(fsl_lpspi->dev, "failed to enable clock\n"); dev_err(fsl_lpspi->dev, "failed to enable clock\n");
goto out_controller_put; goto out_pm_get;
} }
temp = readl(fsl_lpspi->base + IMX7ULP_PARAM); temp = readl(fsl_lpspi->base + IMX7ULP_PARAM);
...@@ -949,13 +949,15 @@ static int fsl_lpspi_probe(struct platform_device *pdev) ...@@ -949,13 +949,15 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
ret = fsl_lpspi_dma_init(&pdev->dev, fsl_lpspi, controller); ret = fsl_lpspi_dma_init(&pdev->dev, fsl_lpspi, controller);
if (ret == -EPROBE_DEFER) if (ret == -EPROBE_DEFER)
goto out_controller_put; goto out_pm_get;
if (ret < 0) if (ret < 0)
dev_err(&pdev->dev, "dma setup error %d, use pio\n", ret); dev_err(&pdev->dev, "dma setup error %d, use pio\n", ret);
return 0; return 0;
out_pm_get:
pm_runtime_put_noidle(fsl_lpspi->dev);
out_controller_put: out_controller_put:
spi_controller_put(controller); spi_controller_put(controller);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment