diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-16 17:33:51 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-16 17:33:51 -1000 |
| commit | bb967271c0317de8eed56b20aae978d31507b033 (patch) | |
| tree | b120e82a88dcf00069d3836eafa07502da2794a4 | |
| parent | 2668bc77a102866549784f87693c24e693b195df (diff) | |
| parent | cc51846ba81ca179a3be20f6313e3b72531888c1 (diff) | |
| download | sti-bb967271c0317de8eed56b20aae978d31507b033.tar.gz | |
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()
| -rw-r--r-- | drivers/pwm/core.c | 3 | ||||
| -rw-r--r-- | drivers/pwm/pwm-atmel-hlcdc.c | 2 | ||||
| -rw-r--r-- | drivers/pwm/sysfs.c | 2 | ||||
| -rw-r--r-- | include/linux/pwm.h | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index dba3843c53b8d2..ed337a8c34ab4b 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -457,7 +457,8 @@ int pwm_apply_state(struct pwm_device *pwm, struct pwm_state *state) { int err; - if (!pwm) + if (!pwm || !state || !state->period || + state->duty_cycle > state->period) return -EINVAL; if (!memcmp(state, &pwm->state, sizeof(*state))) diff --git a/drivers/pwm/pwm-atmel-hlcdc.c b/drivers/pwm/pwm-atmel-hlcdc.c index f994c7eaf41c6c..14fc011faa32fe 100644 --- a/drivers/pwm/pwm-atmel-hlcdc.c +++ b/drivers/pwm/pwm-atmel-hlcdc.c @@ -272,7 +272,7 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev) chip->chip.of_pwm_n_cells = 3; chip->chip.can_sleep = 1; - ret = pwmchip_add(&chip->chip); + ret = pwmchip_add_with_polarity(&chip->chip, PWM_POLARITY_INVERSED); if (ret) { clk_disable_unprepare(hlcdc->periph_clk); return ret; diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c index d98599249a0568..01695d48dd5431 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -152,7 +152,7 @@ static ssize_t enable_store(struct device *child, goto unlock; } - pwm_apply_state(pwm, &state); + ret = pwm_apply_state(pwm, &state); unlock: mutex_unlock(&export->lock); diff --git a/include/linux/pwm.h b/include/linux/pwm.h index 17018f3c066ed5..908b67c847cd65 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -235,6 +235,9 @@ static inline int pwm_config(struct pwm_device *pwm, int duty_ns, if (!pwm) return -EINVAL; + if (duty_ns < 0 || period_ns < 0) + return -EINVAL; + pwm_get_state(pwm, &state); if (state.duty_cycle == duty_ns && state.period == period_ns) return 0; |