Commit 82ed23da authored by David Hsu's avatar David Hsu Committed by Jiri Slaby

pwm: Unexport children before chip removal

commit 0733424c upstream.

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: default avatarDavid Hsu <davidhsu@google.com>
Fixes: 76abbdde ("pwm: Add sysfs interface")
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent 6f02d109
...@@ -293,6 +293,8 @@ int pwmchip_remove(struct pwm_chip *chip) ...@@ -293,6 +293,8 @@ int pwmchip_remove(struct pwm_chip *chip)
unsigned int i; unsigned int i;
int ret = 0; int ret = 0;
pwmchip_sysfs_unexport_children(chip);
mutex_lock(&pwm_lock); mutex_lock(&pwm_lock);
for (i = 0; i < chip->npwm; i++) { for (i = 0; i < chip->npwm; i++) {
......
...@@ -348,6 +348,24 @@ void pwmchip_sysfs_unexport(struct pwm_chip *chip) ...@@ -348,6 +348,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) static int __init pwm_sysfs_init(void)
{ {
return class_register(&pwm_class); return class_register(&pwm_class);
......
...@@ -295,6 +295,7 @@ static inline void pwm_add_table(struct pwm_lookup *table, size_t num) ...@@ -295,6 +295,7 @@ static inline void pwm_add_table(struct pwm_lookup *table, size_t num)
#ifdef CONFIG_PWM_SYSFS #ifdef CONFIG_PWM_SYSFS
void pwmchip_sysfs_export(struct pwm_chip *chip); void pwmchip_sysfs_export(struct pwm_chip *chip);
void pwmchip_sysfs_unexport(struct pwm_chip *chip); void pwmchip_sysfs_unexport(struct pwm_chip *chip);
void pwmchip_sysfs_unexport_children(struct pwm_chip *chip);
#else #else
static inline void pwmchip_sysfs_export(struct pwm_chip *chip) static inline void pwmchip_sysfs_export(struct pwm_chip *chip)
{ {
...@@ -303,6 +304,10 @@ static inline void pwmchip_sysfs_export(struct pwm_chip *chip) ...@@ -303,6 +304,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(struct pwm_chip *chip)
{ {
} }
static inline void pwmchip_sysfs_unexport_children(struct pwm_chip *chip)
{
}
#endif /* CONFIG_PWM_SYSFS */ #endif /* CONFIG_PWM_SYSFS */
#endif /* __LINUX_PWM_H */ #endif /* __LINUX_PWM_H */
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