aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/leds
diff options
context:
space:
mode:
authorUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>2008-03-09 20:42:27 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-03-31 23:31:13 +0100
commitd95cbe6158a679d50e03787bb1dc21ff73dac372 (patch)
tree6a4e28ed398da5405e446c5b74e46bdc1f90746f /drivers/leds
parenta9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff)
downloadkernel_samsung_smdk4412-d95cbe6158a679d50e03787bb1dc21ff73dac372.zip
kernel_samsung_smdk4412-d95cbe6158a679d50e03787bb1dc21ff73dac372.tar.gz
kernel_samsung_smdk4412-d95cbe6158a679d50e03787bb1dc21ff73dac372.tar.bz2
leds: Fix potential leds-gpio oops
Call gpio_cansleep only after gpio_request succeeded avoiding an oops. Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds-gpio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 6c0a9c4..d13b622 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -79,6 +79,10 @@ static int gpio_led_probe(struct platform_device *pdev)
cur_led = &pdata->leds[i];
led_dat = &leds_data[i];
+ ret = gpio_request(cur_led->gpio, cur_led->name);
+ if (ret < 0)
+ goto err;
+
led_dat->cdev.name = cur_led->name;
led_dat->cdev.default_trigger = cur_led->default_trigger;
led_dat->gpio = cur_led->gpio;
@@ -87,10 +91,6 @@ static int gpio_led_probe(struct platform_device *pdev)
led_dat->cdev.brightness_set = gpio_led_set;
led_dat->cdev.brightness = LED_OFF;
- ret = gpio_request(led_dat->gpio, led_dat->cdev.name);
- if (ret < 0)
- goto err;
-
gpio_direction_output(led_dat->gpio, led_dat->active_low);
INIT_WORK(&led_dat->work, gpio_led_work);