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-pxa.c | |
| parent | c3499f0bc38d6db78f119f8f95d5d471e026ef88 (diff) | |
| parent | fbd45a12988e75a48d392feb8b0e5feb5d612513 (diff) | |
| download | linux-bf5dd9abcb4443bbab8cb63b9d82b96a4a45c802.tar.bz2 | |
Merge branch 'for-4.7/pwm-args' into for-next
Diffstat (limited to 'drivers/pwm/pwm-pxa.c')
| -rw-r--r-- | drivers/pwm/pwm-pxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index cb2f7024cf68..58b709f29130 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c @@ -160,7 +160,7 @@ pxa_pwm_of_xlate(struct pwm_chip *pc, const struct of_phandle_args *args) if (IS_ERR(pwm)) return pwm; - pwm_set_period(pwm, args->args[0]); + pwm->args.period = args->args[0]; return pwm; } |