diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 0daa2d21cbdec030aec4549b98fb467723c227d6..8fa352ac20f84328f60e7c891db8825e5b363369 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 17d277e0c4a645d6be61bfffb84539f36cacace5..376fe07732ea9261dc81f3ff7411d49ac9051fb3 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 {