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

[linux.git] / drivers / leds / led-core.c

diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index ce8921a753a32107b30915f8c2ae2b837310d33d..71b40d3bf77604e32829f391b6e804bbeefb0cf1 100644 (file)
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -39,9 +39,11 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
        led_cdev->blink_delay_on = delay_on;
        led_cdev->blink_delay_off = delay_off;
 
-       /* never on - don't blink */
-       if (!delay_on)
+       /* never on - just set to off */
+       if (!delay_on) {
+               __led_set_brightness(led_cdev, LED_OFF);
                return;
+       }
 
        /* never off - just set to brightness */
        if (!delay_off) {