Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[firefly-linux-kernel-4.4.55.git] / drivers / pwm / pwm-twl.c

diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
index b99a50e626a64f82ca98783cc373bd2bc4c82e01..04f76725d59158e1da8fa6968b470edfc0670d36 100644 (file)
--- a/drivers/pwm/pwm-twl.c
+++ b/drivers/pwm/pwm-twl.c
@@ -263,14 +263,6 @@ static void twl6030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
        val |= TWL6030_PWM_TOGGLE(pwm->hwpwm, TWL6030_PWMXR);
        val &= ~TWL6030_PWM_TOGGLE(pwm->hwpwm, TWL6030_PWMXS | TWL6030_PWMXEN);
 
-       ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
-       if (ret < 0) {
-               dev_err(chip->dev, "%s: Failed to read TOGGLE3\n", pwm->label);
-               goto out;
-       }
-
-       val |= TWL6030_PWM_TOGGLE(pwm->hwpwm, TWL6030_PWMXS | TWL6030_PWMXEN);
-
        ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
        if (ret < 0) {
                dev_err(chip->dev, "%s: Failed to disable PWM\n", pwm->label);