ENGR00139260-2 [ath6k wifi]add some delay after resuming

add some delay after resuming.

Signed-off-by: Tony Lin <tony.lin@freescale.com>

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index a8bc7cc8599c98224801f6783c7a6d2c2271a8cf..fbcf8613463b710b4204740afccff0de5b0d2fb2 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -284,11 +284,8 @@ source "drivers/net/wireless/rtlwifi/Kconfig"
 source "drivers/net/wireless/wl1251/Kconfig"
 source "drivers/net/wireless/wl12xx/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
-<<<<<<< HEAD
 source "drivers/net/wireless/mwifiex/Kconfig"
 #source "drivers/net/wireless/ath6kl/Kconfig"
-=======
 #source "drivers/net/wireless/ath6kl/Kconfig"
->>>>>>> ENGR00139260-1 [ath6k wifi]remove drivers under drivers/net/wireless
 
 endif # WLAN

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index d555677cf9e48cf383dacf9292831b2a839b0e02..60a0a417b21ffe326088345e881278d53ba1fafa 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -57,9 +57,5 @@ obj-$(CONFIG_WL12XX_PLATFORM_DATA)    += wl12xx/
 
 obj-$(CONFIG_IWM)      += iwmc3200wifi/
 
-<<<<<<< HEAD
 obj-$(CONFIG_MWIFIEX)  += mwifiex/
 #obj-$(CONFIG_ATH6K_LEGACY)    += ath6kl/
-=======
-#obj-$(CONFIG_ATH6K_LEGACY)    += ath6kl/
->>>>>>> ENGR00139260-1 [ath6k wifi]remove drivers under drivers/net/wireless

diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
index 1e0ace8b6d137958a30c3af67d1deb490e4386b4..1bf1a5ae969332767505f47f01d9ec9be30680c4 100644 (file)
--- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2004-2010 Atheros Communications Inc.
+ * Copyright (c) 2004-2011 Atheros Communications Inc.
  * All rights reserved.
  *
  * 
@@ -267,7 +267,11 @@ int ar6000_resume_ev(void *context)
         AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Strange SDIO bus power mode!!\n"));
         break;
     }
-    return 0;
+#ifdef CONFIG_HAS_WAKELOCK
+    wake_unlock(&ar6k_suspend_wake_lock);
+#endif
+    mdelay(100);
+    return A_OK;
 }
 
 void ar6000_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent)