summaryrefslogtreecommitdiff
path: root/drivers/pwm/pwm-pxa.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-pxa.c
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
parente39c0df1be5a97e0910b09af1530bdf3de057a06 (diff)
Merge branch 'for-4.7/pwm-args' into for-4.7/pwm-regulator
Diffstat (limited to 'drivers/pwm/pwm-pxa.c')
-rw-r--r--drivers/pwm/pwm-pxa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
index cb2f7024cf684..58b709f291302 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;
}