pwm: Unexport children before chip removal
PATCH 1/1 pwm: Unexport children before chip removal
Exported pwm channels aren't removed before the pwmchip and are leaked. This results in invalid sysfs files. This fix removes all exported pwm channels before chip removal.
--- drivers/pwm/core.c | 2 ++ drivers/pwm/sysfs.c | 18 ++++++++++++++++++ include/linux/pwm.h | 5 +++++ 3 files changed, 25 insertions(+)
drivers/pwm/core.c +2 -0
@@ -339,6 +339,8 @@ int pwmchip_remove(struct pwm_chip *chip)unsigned int i;int ret =0 ; +pwmchip_sysfs_unexport_children (chip); +mutex_lock (&pwm_lock);for (i =0 ; i < chip->npwm; i++) {
drivers/pwm/sysfs.c +18 -0
@@ -400,6 +400,24 @@ void pwmchip_sysfs_unexport(struct pwm_chip *chip) } } +void pwmchip_sysfs_unexport_children (struct pwm_chip *chip) +{ +struct device *parent; +unsigned int i; + + parent =class_find_device (&pwm_class,NULL , chip, + pwmchip_sysfs_match); +if (!parent) +return ; + +for (i =0 ; i < chip->npwm; i++) { +struct pwm_device *pwm = &chip->pwms[i]; + +if (test_bit (PWMF_EXPORTED , &pwm->flags)) +pwm_unexport_child (parent, pwm); + } +} +static int __init pwm_sysfs_init (void ) {return class_register (&pwm_class);
include/linux/pwm.h +5 -0
@@ -530,6 +530,7 @@ static inline void pwm_remove_table(struct pwm_lookup *table, size_t num)#ifdef CONFIG_PWM_SYSFS void pwmchip_sysfs_export (struct pwm_chip *chip);void pwmchip_sysfs_unexport (struct pwm_chip *chip); +void pwmchip_sysfs_unexport_children (struct pwm_chip *chip);#else static inline void pwmchip_sysfs_export (struct pwm_chip *chip) {
@@ -538,6 +539,10 @@ static inline void pwmchip_sysfs_export(struct pwm_chip *chip)static inline void pwmchip_sysfs_unexport (struct pwm_chip *chip) { } + +static inline void pwmchip_sysfs_unexport_children (struct pwm_chip *chip) +{ +}#endif /* CONFIG_PWM_SYSFS */ #endif /* __LINUX_PWM_H */
Signature · 1 line
2.8.0.rc3.226.g39d4020
Quoted 10 lines · David Hsu
Exported pwm channels aren't removed before the pwmchip and are leaked. This results in invalid sysfs files. This fix removes all exported pwm channels before chip removal.
Signed-off-by David Hsu <[email protected]>--- drivers/pwm/core.c | 2 ++ drivers/pwm/sysfs.c | 18 ++++++++++++++++++ include/linux/pwm.h | 5 +++++ 3 files changed, 25 insertions(+)
Should this also go to the stable kernel releases?
thanks,
greg k-h
Quoted 5 lines · Greg KH
Quoted 4 lines · David Hsu
Exported pwm channels aren't removed before the pwmchip and are leaked. This results in invalid sysfs files. This fix removes all exported pwm channels before chip removal.
Quoted 9 lines
Quoted 6 lines
Signed-off-by David Hsu <[email protected]>--- drivers/pwm/core.c | 2 ++ drivers/pwm/sysfs.c | 18 ++++++++++++++++++ include/linux/pwm.h | 5 +++++ 3 files changed, 25 insertions(+)Should this also go to the stable kernel releases?
Yes, this should go into stable.
Thanks,
David
Quoted 3 lines
thanks,
greg k-h
Thierry Reding
AppliedQuoted 10 lines · David Hsu
Exported pwm channels aren't removed before the pwmchip and are leaked. This results in invalid sysfs files. This fix removes all exported pwm channels before chip removal.
Signed-off-by David Hsu <[email protected]>--- drivers/pwm/core.c | 2 ++ drivers/pwm/sysfs.c | 18 ++++++++++++++++++ include/linux/pwm.h | 5 +++++ 3 files changed, 25 insertions(+)
I've applied this with the following added to the commit message:
since this seems to have been wrong since forever.
Thierry
Quoted 12 lines · Thierry Reding
Quoted 10 lines · David Hsu
Exported pwm channels aren't removed before the pwmchip and are leaked. This results in invalid sysfs files. This fix removes all exported pwm channels before chip removal.
Signed-off-by David Hsu <[email protected]>--- drivers/pwm/core.c | 2 ++ drivers/pwm/sysfs.c | 18 ++++++++++++++++++ include/linux/pwm.h | 5 +++++ 3 files changed, 25 insertions(+)
Quoted 5 lines
I've applied this with the following added to the commit message:
Fixes 76abbdde2d95 ("pwm: Add sysfs interface")since this seems to have been wrong since forever.
Wonderful, thanks for doing that.
greg k-h