summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2018-11-21 13:51:27 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2018-11-21 13:51:27 +1100
commit2ee701f96f2a34fd8d7297c3536a77eda74746e7 (patch)
treeeb7f275ec469e563753d6c7e5136d794dc712648 /drivers
parent3b48571b7b4001f0672285778c7596fd630cdb8b (diff)
parentf82d15e223403b05fffb33ba792b87a8620f6fee (diff)
Merge remote-tracking branch 'pwm/for-next'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pwm/pwm-lpc18xx-sct.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pwm/pwm-lpc18xx-sct.c b/drivers/pwm/pwm-lpc18xx-sct.c
index d7f5f7de030d..475918d9f543 100644
--- a/drivers/pwm/pwm-lpc18xx-sct.c
+++ b/drivers/pwm/pwm-lpc18xx-sct.c
@@ -296,7 +296,6 @@ static int lpc18xx_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
set_bit(event, &lpc18xx_pwm->event_map);
lpc18xx_data->duty_event = event;
- lpc18xx_pwm_config_duty(chip, pwm, pwm_get_duty_cycle(pwm));
return 0;
}
@@ -306,8 +305,6 @@ static void lpc18xx_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
struct lpc18xx_pwm_chip *lpc18xx_pwm = to_lpc18xx_pwm_chip(chip);
struct lpc18xx_pwm_data *lpc18xx_data = pwm_get_chip_data(pwm);
- pwm_disable(pwm);
- pwm_set_duty_cycle(pwm, 0);
clear_bit(lpc18xx_data->duty_event, &lpc18xx_pwm->event_map);
}