leds: sgm3140: Add missing timer cleanup and flash gpio control

[linux-2.6-block.git] / drivers / leds / flash / leds-sgm3140.c

diff --git a/drivers/leds/flash/leds-sgm3140.c b/drivers/leds/flash/leds-sgm3140.c
index eb648ff54b4e5507a7090e236a34cb515b96f82d..db0ac6641954e940afbc7a84b81dc87c254899dc 100644 (file)
--- a/drivers/leds/flash/leds-sgm3140.c
+++ b/drivers/leds/flash/leds-sgm3140.c
@@ -114,8 +114,11 @@ static int sgm3140_brightness_set(struct led_classdev *led_cdev,
                                "failed to enable regulator: %d\n", ret);
                        return ret;
                }
+               gpiod_set_value_cansleep(priv->flash_gpio, 0);
                gpiod_set_value_cansleep(priv->enable_gpio, 1);
        } else {
+               del_timer_sync(&priv->powerdown_timer);
+               gpiod_set_value_cansleep(priv->flash_gpio, 0);
                gpiod_set_value_cansleep(priv->enable_gpio, 0);
                ret = regulator_disable(priv->vin_regulator);
                if (ret) {