1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 894270611f2c..536c14aa71f3 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -60,9 +60,10 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter,
         int status;
 
         /* Wait for completion */
-        status = wait_event_interruptible(adapter->cmd_wait_q.wait,
-                                          *(cmd_queued->condition));
-        if (status) {
+        status = wait_event_interruptible_timeout(adapter->cmd_wait_q.wait,
+                                                  *(cmd_queued->condition),
+                                                  (12 * HZ));
+        if (status <= 0) {
                 dev_err(adapter->dev, "cmd_wait_q terminated: %d\n", status);
                 mwifiex_cancel_all_pending_cmd(adapter);
                 return status;