---

yaml --- r: 277111 b: refs/heads/master c: b015dbc h: refs/heads/master i: 277109: ac8c179 277107: c8ea259 277103: 16b5181 v: v3
git-mirror · Jan 3, 2012 · 3dd0289 · 3dd0289
1 parent 95233f4
commit 3dd0289
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09009512e5e7ab341b1554a256f81dd512c1f4bf
+refs/heads/master: b015dbc0f95eef34819515bd403a62569bca23df
diff --git a/trunk/drivers/net/wireless/mwifiex/sta_ioctl.c b/trunk/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -55,9 +55,14 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
 {
 	bool cancel_flag = false;
 	int status = adapter->cmd_wait_q.status;
-	struct cmd_ctrl_node *cmd_queued = adapter->cmd_queued;
+	struct cmd_ctrl_node *cmd_queued;
 
+	if (!adapter->cmd_queued)
+		return 0;
+
+	cmd_queued = adapter->cmd_queued;
 	adapter->cmd_queued = NULL;
+
 	dev_dbg(adapter->dev, "cmd pending\n");
 	atomic_inc(&adapter->cmd_pending);