diff --git a/[refs] b/[refs]
index 08fb3386e94c..60db2c67552d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4f552321fa2cfe1d6b1846138d2aa8254308f96
+refs/heads/master: a571ea4eb34adbf33bbaf4bdc6db6037b1a93e0f
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-led.c b/trunk/drivers/net/wireless/iwlwifi/iwl-led.c
index d59ad1844e25..4fe5ee2ba545 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -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;
 }