---

yaml --- r: 118555 b: refs/heads/master c: 14b5433 h: refs/heads/master i: 118553: cdd0595 118551: 221877c v: v3
git-mirror · Nov 6, 2008 · 18f032b · 18f032b
1 parent 6e83e4c
commit 18f032b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2420ebc104d38567ee977a3c15dc675a9dd3b07c
+refs/heads/master: 14b5433606289dbc5b6fd70ced11462f80e95003
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6256,6 +6256,11 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
 					      n_probes,
 			(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);
 
+	if (scan->channel_count == 0) {
+		IWL_DEBUG_SCAN("channel count %d\n", scan->channel_count);
+		goto done;
+	}
+
 	cmd.len += le16_to_cpu(scan->tx_cmd.len) +
 	    scan->channel_count * sizeof(struct iwl3945_scan_channel);
 	cmd.data = scan;