Commit 97cca37c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman

pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional

[ Upstream commit 43efdc8f ]

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: 6604c655 ("pwm: Add PWM driver for OMAP using dual-mode timers")
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3827efdb
...@@ -364,6 +364,11 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev) ...@@ -364,6 +364,11 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
static int pwm_omap_dmtimer_remove(struct platform_device *pdev) static int pwm_omap_dmtimer_remove(struct platform_device *pdev)
{ {
struct pwm_omap_dmtimer_chip *omap = platform_get_drvdata(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)) if (pm_runtime_active(&omap->dm_timer_pdev->dev))
omap->pdata->stop(omap->dm_timer); omap->pdata->stop(omap->dm_timer);
...@@ -372,7 +377,7 @@ static int pwm_omap_dmtimer_remove(struct platform_device *pdev) ...@@ -372,7 +377,7 @@ static int pwm_omap_dmtimer_remove(struct platform_device *pdev)
mutex_destroy(&omap->mutex); mutex_destroy(&omap->mutex);
return pwmchip_remove(&omap->chip); return 0;
} }
static const struct of_device_id pwm_omap_dmtimer_of_match[] = { static const struct of_device_id pwm_omap_dmtimer_of_match[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment