Merge tag 'clk-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/clk...

[deliverable/linux.git] / drivers / leds / led-class-flash.c

diff --git a/drivers/leds/led-class-flash.c b/drivers/leds/led-class-flash.c
index 300a2c9007cac4465cd77cbceeb9a3b4af88e5b5..cf398275a53cbc48ecbf3f49ec9017b26da27dbf 100644 (file)
--- a/drivers/leds/led-class-flash.c
+++ b/drivers/leds/led-class-flash.c
@@ -108,7 +108,7 @@ static ssize_t flash_strobe_store(struct device *dev,
        if (ret)
                goto unlock;
 
-       if (state < 0 || state > 1) {
+       if (state > 1) {
                ret = -EINVAL;
                goto unlock;
        }
@@ -316,10 +316,6 @@ int led_classdev_flash_register(struct device *parent,
        if (ret < 0)
                return ret;
 
-       /* Setting a torch brightness needs to have immediate effect */
-       led_cdev->flags &= ~SET_BRIGHTNESS_ASYNC;
-       led_cdev->flags |= SET_BRIGHTNESS_SYNC;
-
        return 0;
 }
 EXPORT_SYMBOL_GPL(led_classdev_flash_register);