From 792d0561fd8c0a798b0cb5d1e5694706e29c4efd Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Sun, 9 Sep 2012 20:59:17 +0200
Subject: [PATCH] --- yaml --- r: 328171 b: refs/heads/master c:
 2d1c0044ddc708885146af1d6790436a613cac5b h: refs/heads/master i:   328169:
 c73a108fc1f78ac7b61ed3fb2cb21425334ea3c5   328167:
 cdf4915b32d746ec518d5e84f14f864de56f696d v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/net/wireless/iwlwifi/pcie/trans.c | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 36f603303c71..3b5561966717 100644
--- 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
index 7da075f5bffa..3f11b17e14ce 100644
--- 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);