---

yaml --- r: 327904 b: refs/heads/master c: 26fc36a h: refs/heads/master v: v3
git-mirror · Sep 7, 2012 · cdfca74 · cdfca74
1 parent c280110
commit cdfca74
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: 21cd54a34070c46e87960ce2b50aba9e2f3ecda4
+refs/heads/master: 26fc36ab756d305274f056755705478dc4dda521
diff --git a/trunk/drivers/net/wireless/mwifiex/init.c b/trunk/drivers/net/wireless/mwifiex/init.c
@@ -92,6 +92,11 @@ static void scan_delay_timer_fn(unsigned long data)
 			kfree(priv->user_scan_cfg);
 			priv->user_scan_cfg = NULL;
 		}
+
+		if (priv->scan_pending_on_block) {
+			priv->scan_pending_on_block = false;
+			up(&priv->async_sem);
+		}
 		goto done;
 	}