summaryrefslogtreecommitdiffstats
path: root/drivers/pwm
diff options
context:
space:
mode:
authorUwe Kleine-König <uwe@kleine-koenig.org>2019-09-02 16:39:41 +0200
committerThierry Reding <thierry.reding@gmail.com>2019-09-21 01:48:54 +0200
commitba73deb16ff5b2d70b1ffc025c84c1126aad7fea (patch)
treec83298f1ed7d34d54466414a357a983d978b2412 /drivers/pwm
parentpwm: bcm2835: Suppress error message during deferred probe (diff)
downloadlinux-ba73deb16ff5b2d70b1ffc025c84c1126aad7fea.tar.xz
linux-ba73deb16ff5b2d70b1ffc025c84c1126aad7fea.zip
pwm: rockchip: Set polarity unconditionally in .get_state()
Don't rely on *state being zero initialized and PWM_POLARITY_NORMAL being zero. So always assign .polarity. Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
-rw-r--r--drivers/pwm/pwm-rockchip.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c
index 51b96cb7dd25..8eb2db59741d 100644
--- a/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c
@@ -90,10 +90,10 @@ static void rockchip_pwm_get_state(struct pwm_chip *chip,
state->enabled = ((val & enable_conf) == enable_conf) ?
true : false;
- if (pc->data->supports_polarity) {
- if (!(val & PWM_DUTY_POSITIVE))
- state->polarity = PWM_POLARITY_INVERSED;
- }
+ if (pc->data->supports_polarity && !(val & PWM_DUTY_POSITIVE))
+ state->polarity = PWM_POLARITY_INVERSED;
+ else
+ state->polarity = PWM_POLARITY_NORMAL;
clk_disable(pc->pclk);
}