From: Uwe Kleine-König Date: Thu, 17 Jun 2021 09:51:43 +0000 (+0200) Subject: pwm: tegra: Assert reset only after the PWM was unregistered X-Git-Tag: v5.14-rc1~42^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f1a3bd4510afd8cf5ab5a6169ad64981a62dccf;p=thirdparty%2Fkernel%2Flinux.git pwm: tegra: Assert reset only after the PWM was unregistered The driver is supposed to stay functional until pwmchip_remove() returns. So the reset must be asserted only after that. pwmchip_remove() always returns 0, so the return code can be ignored which keeps the tegra_pwm_remove() a bit simpler. Signed-off-by: Uwe Kleine-König Signed-off-by: Thierry Reding --- diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c index e865743e59890..11a10b575ace9 100644 --- a/drivers/pwm/pwm-tegra.c +++ b/drivers/pwm/pwm-tegra.c @@ -301,9 +301,11 @@ static int tegra_pwm_remove(struct platform_device *pdev) { struct tegra_pwm_chip *pc = platform_get_drvdata(pdev); + pwmchip_remove(&pc->chip); + reset_control_assert(pc->rst); - return pwmchip_remove(&pc->chip); + return 0; } #ifdef CONFIG_PM_SLEEP