1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index b0a76c5bec66..9a041e5b209c 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -322,7 +322,8 @@ static ssize_t lbs_setuserscan(struct file *file,
 
         lbs_scan_networks(priv, scan_cfg, 1);
         wait_event_interruptible(priv->adapter->cmd_pending,
-                                 priv->adapter->surpriseremoved || !priv->adapter->nr_cmd_pending);
+                                 priv->adapter->surpriseremoved || 
+                                 (!priv->adapter->cur_cmd && list_empty(&priv->adapter->cmdpendingq)));
 
         if (priv->adapter->surpriseremoved)
                 goto out_scan_cfg;