Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / leds / leds-ss4200.c

diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
index a699232..fcaa347 100644 (file)
--- a/drivers/leds/leds-ss4200.c
+++ b/drivers/leds/leds-ss4200.c
@@ -478,7 +478,6 @@ ATTRIBUTE_GROUPS(nasgpio_led);
 
 static int register_nasgpio_led(int led_nr)
 {
-       int ret;
        struct nasgpio_led *nas_led = &nasgpio_leds[led_nr];
        struct led_classdev *led = get_classdev_for_led_nr(led_nr);
 
@@ -489,11 +488,8 @@ static int register_nasgpio_led(int led_nr)
        led->brightness_set = nasgpio_led_set_brightness;
        led->blink_set = nasgpio_led_set_blink;
        led->groups = nasgpio_led_groups;
-       ret = led_classdev_register(&nas_gpio_pci_dev->dev, led);
-       if (ret)
-               return ret;
 
-       return 0;
+       return led_classdev_register(&nas_gpio_pci_dev->dev, led);
 }
 
 static void unregister_nasgpio_led(int led_nr)