diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
commit | 08fb98f5bf95cef902fc30427b39617a6f6875c7 (patch) | |
tree | d709cdc500b447bb957fd1e7fbc9073005b8ce8e /drivers/pwm/core.c | |
parent | 99aa22d0d8f70d9317727ab40c85b2ead740a6ca (diff) | |
parent | a017f583ec87d40b06eee6a6beeabe879c8113dd (diff) |
Merge branch 'linus' into x86/fpu, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pwm/core.c')
-rw-r--r-- | drivers/pwm/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index dba3843c53b8..ed337a8c34ab 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))) |