diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 14:57:47 +0200 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 14:57:47 +0200 |
| commit | bf5dd9abcb4443bbab8cb63b9d82b96a4a45c802 (patch) | |
| tree | a4d776d644c5b5140490f26c95578f9dcb77653d /drivers/pwm/pwm-clps711x.c | |
| parent | c3499f0bc38d6db78f119f8f95d5d471e026ef88 (diff) | |
| parent | fbd45a12988e75a48d392feb8b0e5feb5d612513 (diff) | |
Merge branch 'for-4.7/pwm-args' into for-next
Diffstat (limited to 'drivers/pwm/pwm-clps711x.c')
| -rw-r--r-- | drivers/pwm/pwm-clps711x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-clps711x.c b/drivers/pwm/pwm-clps711x.c index a80c10803636..7d335422cfda 100644 --- a/drivers/pwm/pwm-clps711x.c +++ b/drivers/pwm/pwm-clps711x.c @@ -60,7 +60,7 @@ static int clps711x_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm) return -EINVAL; /* Store constant period value */ - pwm_set_period(pwm, DIV_ROUND_CLOSEST(NSEC_PER_SEC, freq)); + pwm->args.period = DIV_ROUND_CLOSEST(NSEC_PER_SEC, freq); return 0; } |