---

yaml --- r: 134884 b: refs/heads/master c: 41d2f29 h: refs/heads/master v: v3
git-mirror · Feb 27, 2009 · 22989cc · 22989cc
1 parent d68f453
commit 22989cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c493b017e0631ac023f904a732e8b615d4870426
+refs/heads/master: 41d2f291d78fb90ec26122c1c67d0c151965b378
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -644,6 +644,9 @@ static u16 iwl_adjust_beacon_interval(u16 beacon_val)
 					/ MAX_UCODE_BEACON_INTERVAL;
 	new_val = beacon_val / beacon_factor;
 
+	if (!new_val)
+		new_val = MAX_UCODE_BEACON_INTERVAL;
+
 	return new_val;
 }