pwm: renesas-tpu: Fix late Runtime PM enablement

[ Upstream commit d5a3c7a4536e1329a758e14340efd0e65252bd3d ]

Runtime PM should be enabled before calling pwmchip_add(), as PWM users
can appear immediately after the PWM chip has been added.
Likewise, Runtime PM should always be disabled after the removal of the
PWM chip, even if the latter failed.

Fixes: 99b82abb0a35b073 ("pwm: Add Renesas TPU PWM driver")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/pwm/pwm-renesas-tpu.c b/drivers/pwm/pwm-renesas-tpu.c
index 075c1a764ba293dab3d1e39df05bc4b49f67b1b3..6247a956cc089323a8eefa1db5a95de93c489b8a 100644 (file)
--- a/drivers/pwm/pwm-renesas-tpu.c
+++ b/drivers/pwm/pwm-renesas-tpu.c
@@ -423,16 +423,17 @@ static int tpu_probe(struct platform_device *pdev)
        tpu->chip.base = -1;
        tpu->chip.npwm = TPU_CHANNEL_MAX;
 
+       pm_runtime_enable(&pdev->dev);
+
        ret = pwmchip_add(&tpu->chip);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to register PWM chip\n");
+               pm_runtime_disable(&pdev->dev);
                return ret;
        }
 
        dev_info(&pdev->dev, "TPU PWM %d registered\n", tpu->pdev->id);
 
-       pm_runtime_enable(&pdev->dev);
-
        return 0;
 }
 
@@ -442,12 +443,10 @@ static int tpu_remove(struct platform_device *pdev)
        int ret;
 
        ret = pwmchip_remove(&tpu->chip);
-       if (ret)
-               return ret;
 
        pm_runtime_disable(&pdev->dev);
 
-       return 0;
+       return ret;
 }
 
 #ifdef CONFIG_OF