Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb967271 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/pwm/core.c

+2 −1
Original line number Diff line number Diff line
@@ -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)))

drivers/pwm/pwm-atmel-hlcdc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/pwm/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/pwm.h

+3 −0
Original line number Diff line number Diff line
@@ -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;