1 files changed, 23 insertions, 31 deletions

diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index 328c64c0841c..9010f7abaf2c 100644
--- a/drivers/leds/ledtrig-timer.c
+++ b/drivers/leds/ledtrig-timer.c
@@ -31,21 +31,17 @@ 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);
-        int ret = -EINVAL;
-        char *after;
-        unsigned long state = simple_strtoul(buf, &after, 10);
-        size_t count = after - buf;
-
-        if (isspace(*after))
-                count++;
-
-        if (count == size) {
-                led_blink_set(led_cdev, &state, &led_cdev->blink_delay_off);
-                led_cdev->blink_delay_on = state;
-                ret = count;
-        }
+        unsigned long state;
+        ssize_t ret = -EINVAL;
+
+        ret = kstrtoul(buf, 10, &state);
+        if (ret)
+                return ret;
 
-        return ret;
+        led_blink_set(led_cdev, &state, &led_cdev->blink_delay_off);
+        led_cdev->blink_delay_on = state;
+
+        return size;
 }
 
 static ssize_t led_delay_off_show(struct device *dev,
@@ -60,21 +56,17 @@ 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);
-        int ret = -EINVAL;
-        char *after;
-        unsigned long state = simple_strtoul(buf, &after, 10);
-        size_t count = after - buf;
-
-        if (isspace(*after))
-                count++;
-
-        if (count == size) {
-                led_blink_set(led_cdev, &led_cdev->blink_delay_on, &state);
-                led_cdev->blink_delay_off = state;
-                ret = count;
-        }
+        unsigned long state;
+        ssize_t ret = -EINVAL;
 
-        return ret;
+        ret = kstrtoul(buf, 10, &state);
+        if (ret)
+                return ret;
+
+        led_blink_set(led_cdev, &led_cdev->blink_delay_on, &state);
+        led_cdev->blink_delay_off = state;
+
+        return size;
 }
 
 static DEVICE_ATTR(delay_on, 0644, led_delay_on_show, led_delay_on_store);
@@ -95,8 +87,7 @@ static void timer_trig_activate(struct led_classdev *led_cdev)
 
         led_blink_set(led_cdev, &led_cdev->blink_delay_on,
                       &led_cdev->blink_delay_off);
-
-        led_cdev->trigger_data = (void *)1;
+        led_cdev->activated = true;
 
         return;
 
@@ -106,9 +97,10 @@ err_out_delayon:
 
 static void timer_trig_deactivate(struct led_classdev *led_cdev)
 {
-        if (led_cdev->trigger_data) {
+        if (led_cdev->activated) {
                 device_remove_file(led_cdev->dev, &dev_attr_delay_on);
                 device_remove_file(led_cdev->dev, &dev_attr_delay_off);
+                led_cdev->activated = false;
         }
 
         /* Stop blinking */