diff --git a/[refs] b/[refs]
index 555756a587dc..fc21a73cffb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03c091e5b726ada6aaf9af1d0e973679099101e4
+refs/heads/master: 1381187991a196a8a7d046e97bd50eec6c37e8df
diff --git a/trunk/drivers/leds/ledtrig-timer.c b/trunk/drivers/leds/ledtrig-timer.c
index b32d5eae8227..9010f7abaf2c 100644
--- a/trunk/drivers/leds/ledtrig-timer.c
+++ b/trunk/drivers/leds/ledtrig-timer.c
@@ -87,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;
 
@@ -98,9 +97,10 @@ static void timer_trig_activate(struct led_classdev *led_cdev)
 
 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 */