Commit bb967271 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pwm/for-4.7-rc4' of...

Merge tag 'pwm/for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

Pull pwm fixes from Thierry Reding:
 "These changes fix a bit of fallout from the introduction of the atomic
  API"

* tag 'pwm/for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: atmel-hlcdc: Fix default PWM polarity
  pwm: sysfs: Get return value from pwm_apply_state()
  pwm: Improve args checking in pwm_apply_state()
parents 2668bc77 cc51846b
...@@ -457,7 +457,8 @@ int pwm_apply_state(struct pwm_device *pwm, struct pwm_state *state) ...@@ -457,7 +457,8 @@ int pwm_apply_state(struct pwm_device *pwm, struct pwm_state *state)
{ {
int err; int err;
if (!pwm) if (!pwm || !state || !state->period ||
state->duty_cycle > state->period)
return -EINVAL; return -EINVAL;
if (!memcmp(state, &pwm->state, sizeof(*state))) if (!memcmp(state, &pwm->state, sizeof(*state)))
......
...@@ -272,7 +272,7 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev) ...@@ -272,7 +272,7 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
chip->chip.of_pwm_n_cells = 3; chip->chip.of_pwm_n_cells = 3;
chip->chip.can_sleep = 1; chip->chip.can_sleep = 1;
ret = pwmchip_add(&chip->chip); ret = pwmchip_add_with_polarity(&chip->chip, PWM_POLARITY_INVERSED);
if (ret) { if (ret) {
clk_disable_unprepare(hlcdc->periph_clk); clk_disable_unprepare(hlcdc->periph_clk);
return ret; return ret;
......
...@@ -152,7 +152,7 @@ static ssize_t enable_store(struct device *child, ...@@ -152,7 +152,7 @@ static ssize_t enable_store(struct device *child,
goto unlock; goto unlock;
} }
pwm_apply_state(pwm, &state); ret = pwm_apply_state(pwm, &state);
unlock: unlock:
mutex_unlock(&export->lock); mutex_unlock(&export->lock);
......
...@@ -235,6 +235,9 @@ static inline int pwm_config(struct pwm_device *pwm, int duty_ns, ...@@ -235,6 +235,9 @@ static inline int pwm_config(struct pwm_device *pwm, int duty_ns,
if (!pwm) if (!pwm)
return -EINVAL; return -EINVAL;
if (duty_ns < 0 || period_ns < 0)
return -EINVAL;
pwm_get_state(pwm, &state); pwm_get_state(pwm, &state);
if (state.duty_cycle == duty_ns && state.period == period_ns) if (state.duty_cycle == duty_ns && state.period == period_ns)
return 0; return 0;
......
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