From 7a74b0723072638d85a909be323d34b390ae5e53 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Tue, 17 Feb 2009 15:04:07 +0000
Subject: [PATCH] --- yaml --- r: 142040 b: refs/heads/master c:
 defb512d2576992c63ba1c18c24eea31cfeaa26e h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/leds/leds-gpio.c | 3 ++-
 trunk/include/linux/leds.h     | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 736d14242b77..354c37d9897b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41c42ff5dbe29b7b826e6736f960959c76e7acf0
+refs/heads/master: defb512d2576992c63ba1c18c24eea31cfeaa26e
diff --git a/trunk/drivers/leds/leds-gpio.c b/trunk/drivers/leds/leds-gpio.c
index 0daa2d21cbde..8fa352ac20f8 100644
--- a/trunk/drivers/leds/leds-gpio.c
+++ b/trunk/drivers/leds/leds-gpio.c
@@ -93,7 +93,8 @@ static int __devinit create_gpio_led(const struct gpio_led *template,
 	}
 	led_dat->cdev.brightness_set = gpio_led_set;
 	led_dat->cdev.brightness = LED_OFF;
-	led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
+	if (!template->retain_state_suspended)
+		led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
 
 	ret = gpio_direction_output(led_dat->gpio, led_dat->active_low);
 	if (ret < 0)
diff --git a/trunk/include/linux/leds.h b/trunk/include/linux/leds.h
index 17d277e0c4a6..376fe07732ea 100644
--- a/trunk/include/linux/leds.h
+++ b/trunk/include/linux/leds.h
@@ -141,7 +141,8 @@ struct gpio_led {
 	const char *name;
 	const char *default_trigger;
 	unsigned 	gpio;
-	u8 		active_low;
+	u8 		active_low : 1;
+	u8		retain_state_suspended : 1;
 };
 
 struct gpio_led_platform_data {