[4.4,4/4] pwm: Clear chip_data in pwm_put()

Message ID 20191202094150.32485-4-lee.jones@linaro.org
State New
Headers show
Series
  • [4.4,1/4] arm: add missing include platform-data/atmel.h
Related show

Commit Message

Lee Jones Dec. 2, 2019, 9:41 a.m.
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>


[ Upstream commit e926b12c611c2095c7976e2ed31753ad6eb5ff1a ]

After a PWM is disposed by its user the per chip data becomes invalid.
Clear the data in common code instead of the device drivers to get
consistent behaviour. Before this patch only three of nine drivers
cleaned up here.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Signed-off-by: Thierry Reding <thierry.reding@gmail.com>

Signed-off-by: Lee Jones <lee.jones@linaro.org>

---
 drivers/pwm/core.c        | 1 +
 drivers/pwm/pwm-samsung.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

-- 
2.24.0

Patch

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 6911f9662300..5e582099ebaa 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -781,6 +781,7 @@  void pwm_put(struct pwm_device *pwm)
 	if (pwm->chip->ops->free)
 		pwm->chip->ops->free(pwm->chip, pwm);
 
+	pwm_set_chip_data(pwm, NULL);
 	pwm->label = NULL;
 
 	module_put(pwm->chip->ops->owner);
diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c
index ada2d326dc3e..42f270ef2f7b 100644
--- a/drivers/pwm/pwm-samsung.c
+++ b/drivers/pwm/pwm-samsung.c
@@ -226,7 +226,6 @@  static int pwm_samsung_request(struct pwm_chip *chip, struct pwm_device *pwm)
 static void pwm_samsung_free(struct pwm_chip *chip, struct pwm_device *pwm)
 {
 	devm_kfree(chip->dev, pwm_get_chip_data(pwm));
-	pwm_set_chip_data(pwm, NULL);
 }
 
 static int pwm_samsung_enable(struct pwm_chip *chip, struct pwm_device *pwm)