2 files changed, 17 insertions, 7 deletions

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index f3f91e716a42..c240b5437145 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -499,10 +499,10 @@ int pwm_enable(struct pwm_device *pwm)
         if (!pwm)
                 return -EINVAL;
 
-        if (!test_and_set_bit(PWMF_ENABLED, &pwm->flags)) {
+        if (!pwm_is_enabled(pwm)) {
                 err = pwm->chip->ops->enable(pwm->chip, pwm);
-                if (err)
-                        clear_bit(PWMF_ENABLED, &pwm->flags);
+                if (!err)
+                        pwm->state.enabled = true;
         }
 
         return err;
@@ -515,8 +515,13 @@ EXPORT_SYMBOL_GPL(pwm_enable);
  */
 void pwm_disable(struct pwm_device *pwm)
 {
-        if (pwm && test_and_clear_bit(PWMF_ENABLED, &pwm->flags))
+        if (!pwm)
+                return;
+
+        if (pwm_is_enabled(pwm)) {
                 pwm->chip->ops->disable(pwm->chip, pwm);
+                pwm->state.enabled = false;
+        }
 }
 EXPORT_SYMBOL_GPL(pwm_disable);
 
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index 51d4005418f9..150563a806d6 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -94,8 +94,7 @@ struct pwm_args {
 
 enum {
         PWMF_REQUESTED = 1 << 0,
-        PWMF_ENABLED = 1 << 1,
-        PWMF_EXPORTED = 1 << 2,
+        PWMF_EXPORTED = 1 << 1,
 };
 
 /*
@@ -103,11 +102,13 @@ enum {
  * @period: PWM period (in nanoseconds)
  * @duty_cycle: PWM duty cycle (in nanoseconds)
  * @polarity: PWM polarity
+ * @enabled: PWM enabled status
  */
 struct pwm_state {
         unsigned int period;
         unsigned int duty_cycle;
         enum pwm_polarity polarity;
+        bool enabled;
 };
 
 /**
@@ -146,7 +147,11 @@ static inline void pwm_get_state(const struct pwm_device *pwm,
 
 static inline bool pwm_is_enabled(const struct pwm_device *pwm)
 {
-        return test_bit(PWMF_ENABLED, &pwm->flags);
+        struct pwm_state state;
+
+        pwm_get_state(pwm, &state);
+
+        return state.enabled;
 }
 
 static inline void pwm_set_period(struct pwm_device *pwm, unsigned int period)