drm: Propagate error from drm_fb_helper_init().

[safe/jmp/linux-2.6] / drivers / leds / ledtrig-timer.c

diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index 82c55d6..82b77bd 100644 (file)
--- a/drivers/leds/ledtrig-timer.c
+++ b/drivers/leds/ledtrig-timer.c
@@ -22,9 +22,13 @@
 #include <linux/timer.h>
 #include <linux/ctype.h>
 #include <linux/leds.h>
+#include <linux/slab.h>
 #include "leds.h"
 
 struct timer_trig_data {
+       int brightness_on;              /* LED brightness during "on" period.
+                                        * (LED_OFF < brightness_on <= LED_FULL)
+                                        */
        unsigned long delay_on;         /* milliseconds on */
        unsigned long delay_off;        /* milliseconds off */
        struct timer_list timer;
@@ -34,17 +38,26 @@ static void led_timer_function(unsigned long data)
 {
        struct led_classdev *led_cdev = (struct led_classdev *) data;
        struct timer_trig_data *timer_data = led_cdev->trigger_data;
-       unsigned long brightness = LED_OFF;
-       unsigned long delay = timer_data->delay_off;
+       unsigned long brightness;
+       unsigned long delay;
 
        if (!timer_data->delay_on || !timer_data->delay_off) {
                led_set_brightness(led_cdev, LED_OFF);
                return;
        }
 
-       if (!led_cdev->brightness) {
-               brightness = LED_FULL;
+       brightness = led_get_brightness(led_cdev);
+       if (!brightness) {
+               /* Time to switch the LED on. */
+               brightness = timer_data->brightness_on;
                delay = timer_data->delay_on;
+       } else {
+               /* Store the current brightness value to be able
+                * to restore it when the delay_off period is over.
+                */
+               timer_data->brightness_on = brightness;
+               brightness = LED_OFF;
+               delay = timer_data->delay_off;
        }
 
        led_set_brightness(led_cdev, brightness);
@@ -52,18 +65,16 @@ static void led_timer_function(unsigned long data)
        mod_timer(&timer_data->timer, jiffies + msecs_to_jiffies(delay));
 }
 
-static ssize_t led_delay_on_show(struct device *dev, 
+static ssize_t led_delay_on_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {
        struct led_classdev *led_cdev = dev_get_drvdata(dev);
        struct timer_trig_data *timer_data = led_cdev->trigger_data;
 
-       sprintf(buf, "%lu\n", timer_data->delay_on);
-
-       return strlen(buf) + 1;
+       return sprintf(buf, "%lu\n", timer_data->delay_on);
 }
 
-static ssize_t led_delay_on_store(struct device *dev, 
+static ssize_t led_delay_on_store(struct device *dev,
                struct device_attribute *attr, const char *buf, size_t size)
 {
        struct led_classdev *led_cdev = dev_get_drvdata(dev);
@@ -73,7 +84,7 @@ static ssize_t led_delay_on_store(struct device *dev,
        unsigned long state = simple_strtoul(buf, &after, 10);
        size_t count = after - buf;
 
-       if (*after && isspace(*after))
+       if (isspace(*after))
                count++;
 
        if (count == size) {
@@ -87,7 +98,7 @@ static ssize_t led_delay_on_store(struct device *dev,
                        /* try to activate hardware acceleration, if any */
                        if (!led_cdev->blink_set ||
                            led_cdev->blink_set(led_cdev,
-                               &timer_data->delay_on, &timer_data->delay_off)) {
+                             &timer_data->delay_on, &timer_data->delay_off)) {
                                /* no hardware acceleration, blink via timer */
                                mod_timer(&timer_data->timer, jiffies + 1);
                        }
@@ -98,18 +109,16 @@ static ssize_t led_delay_on_store(struct device *dev,
        return ret;
 }
 
-static ssize_t led_delay_off_show(struct device *dev, 
+static ssize_t led_delay_off_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {
        struct led_classdev *led_cdev = dev_get_drvdata(dev);
        struct timer_trig_data *timer_data = led_cdev->trigger_data;
 
-       sprintf(buf, "%lu\n", timer_data->delay_off);
-
-       return strlen(buf) + 1;
+       return sprintf(buf, "%lu\n", timer_data->delay_off);
 }
 
-static ssize_t led_delay_off_store(struct device *dev, 
+static ssize_t led_delay_off_store(struct device *dev,
                struct device_attribute *attr, const char *buf, size_t size)
 {
        struct led_classdev *led_cdev = dev_get_drvdata(dev);
@@ -119,7 +128,7 @@ static ssize_t led_delay_off_store(struct device *dev,
        unsigned long state = simple_strtoul(buf, &after, 10);
        size_t count = after - buf;
 
-       if (*after && isspace(*after))
+       if (isspace(*after))
                count++;
 
        if (count == size) {
@@ -133,7 +142,7 @@ static ssize_t led_delay_off_store(struct device *dev,
                        /* try to activate hardware acceleration, if any */
                        if (!led_cdev->blink_set ||
                            led_cdev->blink_set(led_cdev,
-                               &timer_data->delay_on, &timer_data->delay_off)) {
+                             &timer_data->delay_on, &timer_data->delay_off)) {
                                /* no hardware acceleration, blink via timer */
                                mod_timer(&timer_data->timer, jiffies + 1);
                        }
@@ -156,6 +165,9 @@ static void timer_trig_activate(struct led_classdev *led_cdev)
        if (!timer_data)
                return;
 
+       timer_data->brightness_on = led_get_brightness(led_cdev);
+       if (timer_data->brightness_on == LED_OFF)
+               timer_data->brightness_on = led_cdev->max_brightness;
        led_cdev->trigger_data = timer_data;
 
        init_timer(&timer_data->timer);
@@ -188,6 +200,7 @@ err_out:
 static void timer_trig_deactivate(struct led_classdev *led_cdev)
 {
        struct timer_trig_data *timer_data = led_cdev->trigger_data;
+       unsigned long on = 0, off = 0;
 
        if (timer_data) {
                device_remove_file(led_cdev->dev, &dev_attr_delay_on);
@@ -195,6 +208,10 @@ static void timer_trig_deactivate(struct led_classdev *led_cdev)
                del_timer_sync(&timer_data->timer);
                kfree(timer_data);
        }
+
+       /* If there is hardware support for blinking, stop it */
+       if (led_cdev->blink_set)
+               led_cdev->blink_set(led_cdev, &on, &off);
 }
 
 static struct led_trigger timer_led_trigger = {