---

yaml --- r: 194467 b: refs/heads/master c: eb2ec0f h: refs/heads/master i: 194465: a93b192 194463: 99fa618 v: v3
git-mirror · Apr 16, 2010 · 2c40c8a · 2c40c8a
1 parent fa9a33e
commit 2c40c8a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a02a2956809d88b42b9a1f8003d60a343353b5ea
+refs/heads/master: eb2ec0fb3c2fe85d42b2d5131e526daa0e298b9e
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -644,10 +644,10 @@ u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,
 	if (WARN_ON(left < ie_len))
 		return len;
 
-	if (ies)
+	if (ies && ie_len) {
 		memcpy(pos, ies, ie_len);
-	len += ie_len;
-	left -= ie_len;
+		len += ie_len;
+	}
 
 	return (u16)len;
 }