redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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

[ Upstream commit 43efdc8f0e ]

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: 6604c6556d ("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>
5.4-rM2-2.2.x-imx-squashed
Uwe Kleine-König 2019-11-11 10:03:54 +01:00 committed by Greg Kroah-Hartman
parent e7e6b53fea
commit 419035d75d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pwm/pwm-omap-dmtimer.c
View File

@ -361,6 +361,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);
@ -369,7 +374,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[] = {