From c647d4ed6fba61a68fa321a71c0553b55a4736c8 Mon Sep 17 00:00:00 2001 From: David Daney Date: Mon, 31 Oct 2011 17:12:17 -0700 Subject: [PATCH] --- yaml --- r: 272210 b: refs/heads/master c: dabc69c24271bd6ac126e3dda4f2d72234da81df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/leds/leds-gpio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 03aa83a2fad9..821a7c776ca1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93f539822ed60e18cd7fb417bff4efa1833af9f2 +refs/heads/master: dabc69c24271bd6ac126e3dda4f2d72234da81df diff --git a/trunk/drivers/leds/leds-gpio.c b/trunk/drivers/leds/leds-gpio.c index 3d8bc327a68d..504cc26c7e4b 100644 --- a/trunk/drivers/leds/leds-gpio.c +++ b/trunk/drivers/leds/leds-gpio.c @@ -121,7 +121,7 @@ static int __devinit create_gpio_led(const struct gpio_led *template, } led_dat->cdev.brightness_set = gpio_led_set; if (template->default_state == LEDS_GPIO_DEFSTATE_KEEP) - state = !!gpio_get_value(led_dat->gpio) ^ led_dat->active_low; + state = !!gpio_get_value_cansleep(led_dat->gpio) ^ led_dat->active_low; else state = (template->default_state == LEDS_GPIO_DEFSTATE_ON); led_dat->cdev.brightness = state ? LED_FULL : LED_OFF;