---

yaml --- r: 291305 b: refs/heads/master c: 9441b85 h: refs/heads/master i: 291303: 4feb706 v: v3
git-mirror · Mar 8, 2012 · ba9d587 · ba9d587
1 parent af2d077
commit ba9d587
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9563fe1696fa0ced8cfa3f935736d4662a81c1c3
+refs/heads/master: 9441b85d59ec9d06cbe749e12a59a06c09e601fa
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1070,9 +1070,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
 	iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
 
 	/* Load the given image to the HW */
-	iwl_load_given_ucode(trans, fw);
-
-	return 0;
+	return iwl_load_given_ucode(trans, fw);
 }
 
 /*