Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / pwm / core.c

diff --git a/kernel/drivers/pwm/core.c b/kernel/drivers/pwm/core.c
index d24ca5f..ec84ff8 100644 (file)
--- a/kernel/drivers/pwm/core.c
+++ b/kernel/drivers/pwm/core.c
@@ -321,6 +321,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++) {
@@ -889,7 +891,7 @@ EXPORT_SYMBOL_GPL(devm_pwm_put);
   */
 bool pwm_can_sleep(struct pwm_device *pwm)
 {
-       return pwm->chip->can_sleep;
+       return true;
 }
 EXPORT_SYMBOL_GPL(pwm_can_sleep);