diff options
| author |   Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2019-11-11 10:03:54 +0100 |
|---|---|---|
| committer |   Thierry Reding <thierry.reding@gmail.com> | 2020-01-20 12:29:34 +0100 |
| commit | 43efdc8f0e6d7088ec61bd55a73bf853f002d043 (patch) | |
| tree | c926c026c3a54fd09a425b51513768ae0ca6bdbd /drivers/pwm | |
| parent | pwm: Implement tracing for .get_state() and .apply_state() (diff) | |
| download | linux-dev-43efdc8f0e6d7088ec61bd55a73bf853f002d043.tar.xz linux-dev-43efdc8f0e6d7088ec61bd55a73bf853f002d043.zip | |
pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional
In the old code (e.g.) mutex_destroy() was called before
pwmchip_remove(). Between these two calls it is possible that a PWM
callback is used which tries to grab the mutex.
Fixes: 6604c6556db9 ("pwm: Add PWM driver for OMAP using dual-mode timers")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
| -rw-r--r-- | drivers/pwm/pwm-omap-dmtimer.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c index 00772fc53490..bdf94c78655f 100644 --- a/drivers/pwm/pwm-omap-dmtimer.c +++ b/drivers/pwm/pwm-omap-dmtimer.c @@ -351,6 +351,11 @@ put: static int pwm_omap_dmtimer_remove(struct platform_device *pdev) { struct pwm_omap_dmtimer_chip *omap = platform_get_drvdata(pdev); + int ret; + + ret = pwmchip_remove(&omap->chip); + if (ret) + return ret; if (pm_runtime_active(&omap->dm_timer_pdev->dev)) omap->pdata->stop(omap->dm_timer); @@ -359,7 +364,7 @@ static int pwm_omap_dmtimer_remove(struct platform_device *pdev) mutex_destroy(&omap->mutex); - return pwmchip_remove(&omap->chip); + return 0; } static const struct of_device_id pwm_omap_dmtimer_of_match[] = { |