2 files changed, 4 insertions, 2 deletions

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 0daa2d21cbde..8fa352ac20f8 100644
--- a/drivers/leds/leds-gpio.c
+++ b/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/include/linux/leds.h b/include/linux/leds.h
index 17d277e0c4a6..376fe07732ea 100644
--- a/include/linux/leds.h
+++ b/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 {