Merge git://git.infradead.org/battery-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl-led.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index d59ad1844e25da36a5572495bc2c2b514c9f748f..03fdf5b434a13de415e957a51237e3985ee99d82 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -40,8 +40,8 @@
 #include <asm/unaligned.h>
 
 #include "iwl-4965.h"
-#include "iwl-io.h"
 #include "iwl-core.h"
+#include "iwl-io.h"
 #include "iwl-helpers.h"
 
 #define IWL_1MB_RATE (128 * 1024)
@@ -238,18 +238,20 @@ static int iwl_leds_register_led(struct iwl_priv *priv,
        led->led_dev.brightness_set = iwl4965_led_brightness_set;
        led->led_dev.default_trigger = trigger;
 
+       led->priv = priv;
+       led->type = type;
+
        ret = led_classdev_register(device, &led->led_dev);
        if (ret) {
                IWL_ERROR("Error: failed to register led handler.\n");
                return ret;
        }
 
-       led->priv = priv;
-       led->type = type;
        led->registered = 1;
 
        if (set_led && led->led_on)
                led->led_on(priv, IWL_LED_LINK);
+
        return 0;
 }