diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2019-11-11 10:03:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-24 08:34:49 +0100 |
| commit | 97cca37c9b3ffdb7629d9ad4c136e41c50ed19f3 (patch) | |
| tree | c25099c49f3e608e4452502ea3cca6bba4ddf945 | |
| parent | 3827efdb99124cad83ad30d4896bb43f1389b33c (diff) | |
| download | linux-stable-97cca37c9b3ffdb7629d9ad4c136e41c50ed19f3.tar.gz linux-stable-97cca37c9b3ffdb7629d9ad4c136e41c50ed19f3.tar.bz2 linux-stable-97cca37c9b3ffdb7629d9ad4c136e41c50ed19f3.zip | |
pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional
[ Upstream commit 43efdc8f0e6d7088ec61bd55a73bf853f002d043 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -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 2d585c101d52..c6e710a713d3 100644 --- a/drivers/pwm/pwm-omap-dmtimer.c +++ b/drivers/pwm/pwm-omap-dmtimer.c @@ -364,6 +364,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); @@ -372,7 +377,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[] = { |