---

yaml --- r: 328171 b: refs/heads/master c: 2d1c004 h: refs/heads/master i: 328169: c73a108 328167: cdf4915 v: v3
git-mirror · Sep 10, 2012 · 792d056 · 792d056
1 parent 4740dbc
commit 792d056
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee7d737c45440062320c16bc7ad7bb5c9fe8888e
+refs/heads/master: 2d1c0044ddc708885146af1d6790436a613cac5b
diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c b/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -979,17 +979,16 @@ static int iwl_load_section(struct iwl_trans *trans, u8 section_num,
 static int iwl_load_given_ucode(struct iwl_trans *trans,
 				const struct fw_img *image)
 {
-	int ret = 0;
-		int i;
+	int i, ret = 0;
 
-		for (i = 0; i < IWL_UCODE_SECTION_MAX; i++) {
-			if (!image->sec[i].p_addr)
-				break;
+	for (i = 0; i < IWL_UCODE_SECTION_MAX; i++) {
+		if (!image->sec[i].p_addr)
+			break;
 
-			ret = iwl_load_section(trans, i, &image->sec[i]);
-			if (ret)
-				return ret;
-		}
+		ret = iwl_load_section(trans, i, &image->sec[i]);
+		if (ret)
+			return ret;
+	}
 
 	/* Remove all resets to allow NIC to operate */
 	iwl_write32(trans, CSR_RESET, 0);