drm/tegra: dpaux: Fix PM disable depth imbalance in tegra_dpaux_probe

The pm_runtime_enable function increases the power disable depth,
which means that we must perform a matching decrement on the error
handling path to maintain balance within the given context.
Additionally, we need to address the same issue for pm_runtime_get_sync.
We fix this by invoking pm_runtime_disable and pm_runtime_put_sync
when error returns.

Fixes: 82b81b3ec1a7 ("drm/tegra: dpaux: Implement runtime PM")
Signed-off-by: Zhang Shurong <zhang_shurong@foxmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/tencent_B13DB7F6C0023C46157250A524966F326A09@qq.com

diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c
index ef02d530f78d751a51b6c1a7681ee8e6246287e6..ae12d001a04bfbe98504b6435dc9b9d964f7f4aa 100644 (file)
--- a/drivers/gpu/drm/tegra/dpaux.c
+++ b/drivers/gpu/drm/tegra/dpaux.c
@@ -522,7 +522,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
        if (err < 0) {
                dev_err(dpaux->dev, "failed to request IRQ#%u: %d\n",
                        dpaux->irq, err);
-               return err;
+               goto err_pm_disable;
        }
 
        disable_irq(dpaux->irq);
@@ -542,7 +542,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
         */
        err = tegra_dpaux_pad_config(dpaux, DPAUX_PADCTL_FUNC_I2C);
        if (err < 0)
-               return err;
+               goto err_pm_disable;
 
 #ifdef CONFIG_GENERIC_PINCONF
        dpaux->desc.name = dev_name(&pdev->dev);
@@ -555,7 +555,8 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
        dpaux->pinctrl = devm_pinctrl_register(&pdev->dev, &dpaux->desc, dpaux);
        if (IS_ERR(dpaux->pinctrl)) {
                dev_err(&pdev->dev, "failed to register pincontrol\n");
-               return PTR_ERR(dpaux->pinctrl);
+               err = PTR_ERR(dpaux->pinctrl);
+               goto err_pm_disable;
        }
 #endif
        /* enable and clear all interrupts */
@@ -571,10 +572,15 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
        err = devm_of_dp_aux_populate_ep_devices(&dpaux->aux);
        if (err < 0) {
                dev_err(dpaux->dev, "failed to populate AUX bus: %d\n", err);
-               return err;
+               goto err_pm_disable;
        }
 
        return 0;
+
+err_pm_disable:
+       pm_runtime_put_sync(&pdev->dev);
+       pm_runtime_disable(&pdev->dev);
+       return err;
 }
 
 static void tegra_dpaux_remove(struct platform_device *pdev)