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-omap-dmtimer.c | |
| parent | d2a3f206846b4b140aa1fe5be29499e9191fb1fe (diff) | |
| parent | 23e3523f5d3a980edf7f189743cf4bb9490400a9 (diff) | |
Merge branch 'for-4.7/pwm-atomic' into for-next
Diffstat (limited to 'drivers/pwm/pwm-omap-dmtimer.c')
| -rw-r--r-- | drivers/pwm/pwm-omap-dmtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c index b7e6ecba7d5c..3e95090cd7cf 100644 --- a/drivers/pwm/pwm-omap-dmtimer.c +++ b/drivers/pwm/pwm-omap-dmtimer.c @@ -192,7 +192,7 @@ static int pwm_omap_dmtimer_config(struct pwm_chip *chip, load_value, load_value, match_value, match_value); omap->pdata->set_pwm(omap->dm_timer, - pwm->polarity == PWM_POLARITY_INVERSED, + pwm_get_polarity(pwm) == PWM_POLARITY_INVERSED, true, PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE); |