summaryrefslogtreecommitdiff
path: root/drivers/pwm/pwm-clps711x.c
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@gmail.com>2016-05-03 13:45:33 +0200
committerThierry Reding <thierry.reding@gmail.com>2016-05-03 13:45:33 +0200
commit1591196ebdec9202b44d35b5a000910fd7a1898a (patch)
tree3299bb34c94cd6b989ecd54ff7cfcc9cc962d9ff /drivers/pwm/pwm-clps711x.c
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
parente39c0df1be5a97e0910b09af1530bdf3de057a06 (diff)
Merge branch 'for-4.7/pwm-args' into for-4.7/pwm-regulator
Diffstat (limited to 'drivers/pwm/pwm-clps711x.c')
-rw-r--r--drivers/pwm/pwm-clps711x.c2
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;
}