diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 14:57:58 +0200 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 14:57:58 +0200 |
| commit | 18c588786c08458f5d965d8735ab48f9e51e0b4b (patch) | |
| tree | 925893d58c00432f93830d1b83405c9d44d79bb8 /drivers/pwm/pwm-lpc18xx-sct.c | |
| parent | d2a3f206846b4b140aa1fe5be29499e9191fb1fe (diff) | |
| parent | 23e3523f5d3a980edf7f189743cf4bb9490400a9 (diff) | |
Merge branch 'for-4.7/pwm-atomic' into for-next
Diffstat (limited to 'drivers/pwm/pwm-lpc18xx-sct.c')
| -rw-r--r-- | drivers/pwm/pwm-lpc18xx-sct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-lpc18xx-sct.c b/drivers/pwm/pwm-lpc18xx-sct.c index 9861fed4e67d..19dc64cab2f0 100644 --- a/drivers/pwm/pwm-lpc18xx-sct.c +++ b/drivers/pwm/pwm-lpc18xx-sct.c @@ -249,7 +249,7 @@ static int lpc18xx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) LPC18XX_PWM_EVSTATEMSK(lpc18xx_data->duty_event), LPC18XX_PWM_EVSTATEMSK_ALL); - if (pwm->polarity == PWM_POLARITY_NORMAL) { + if (pwm_get_polarity(pwm) == PWM_POLARITY_NORMAL) { set_event = lpc18xx_pwm->period_event; clear_event = lpc18xx_data->duty_event; res_action = LPC18XX_PWM_RES_SET; |