diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-02 11:23:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-02 11:23:09 -0700 |
commit | e935842a06dbcdefcdd93174a97010f22a36e26d (patch) | |
tree | 3c644b8201aacda0ce667a53ca4dd0ea3122e7ba | |
parent | f83e148a410006397f01e96570e73038a3a261fa (diff) | |
parent | 40a6b9a00930fd6b59aa2eb6135abc2efe5440c3 (diff) | |
download | linux-e935842a06dbcdefcdd93174a97010f22a36e26d.tar.bz2 |
Merge tag 'pwm/for-5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm fixes from Thierry Reding:
"It turned out that relying solely on drivers storing all the PWM state
in hardware was a little premature and causes a number of subtle (and
some not so subtle) regressions. Revert the offending patch for now"
* tag 'pwm/for-5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
Revert "pwm: Let pwm_get_state() return the last implemented state"
-rw-r--r-- | drivers/pwm/core.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 6ad51aa60c03..f877e77d9184 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -472,14 +472,7 @@ int pwm_apply_state(struct pwm_device *pwm, const struct pwm_state *state) if (err) return err; - /* - * .apply might have to round some values in *state, if possible - * read the actually implemented value back. - */ - if (chip->ops->get_state) - chip->ops->get_state(chip, pwm, &pwm->state); - else - pwm->state = *state; + pwm->state = *state; } else { /* * FIXME: restore the initial state in case of error. |