From cdfca74578a1cc105a4c39da8041a2a6d1320c7d Mon Sep 17 00:00:00 2001
From: Amitkumar Karwar <akarwar@marvell.com>
Date: Mon, 27 Aug 2012 20:32:51 -0700
Subject: [PATCH] --- yaml --- r: 327904 b: refs/heads/master c:
 26fc36ab756d305274f056755705478dc4dda521 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/wireless/mwifiex/init.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a4a09b75a557..70e364041c88 100644
--- 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
index fad2c8d2bdde..c510563dc00d 100644
--- 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;
 	}