From 6eca54f12fcfc33792b6b38ffd68ab388bfeb4e0 Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <tipecaml@gmail.com>
Date: Sun, 27 Jan 2013 23:42:48 +0100
Subject: [PATCH] --- yaml --- r: 352312 b: refs/heads/master c:
 485f107d341cb1d09e010e0466b02a1ad026f489 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/wireless/mwifiex/join.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ed2f629fa0ab..b47ca0d3d790 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44ba973699b831414c3f8eef68ee5a7fe1208a05
+refs/heads/master: 485f107d341cb1d09e010e0466b02a1ad026f489
diff --git a/trunk/drivers/net/wireless/mwifiex/join.c b/trunk/drivers/net/wireless/mwifiex/join.c
index 893d809ba83c..f0a634d237c1 100644
--- a/trunk/drivers/net/wireless/mwifiex/join.c
+++ b/trunk/drivers/net/wireless/mwifiex/join.c
@@ -157,8 +157,8 @@ static int mwifiex_get_common_rates(struct mwifiex_private *priv, u8 *rate1,
 
 	memset(rate1, 0, rate1_size);
 
-	for (i = 0; rate2[i] && i < rate2_size; i++) {
-		for (j = 0; tmp[j] && j < rate1_size; j++) {
+	for (i = 0; i < rate2_size && rate2[i]; i++) {
+		for (j = 0; j < rate1_size && tmp[j]; j++) {
 			/* Check common rate, excluding the bit for
 			   basic rate */
 			if ((rate2[i] & 0x7F) == (tmp[j] & 0x7F)) {