net: wireless: bcmdhd: Avoid suspend on watchdog

Change-Id: Ic41a8f369a2ee8b2a0084e6a1cbf6b454ff53353
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c
index d0b4c1c325c6a5be9793827b9f6b1c9e61ff4da8..eb155614cd8c3d3374dd7be6f9c76f965dd8a2e4 100644 (file)
--- a/drivers/net/wireless/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/bcmdhd/dhd_linux.c
@@ -4875,7 +4875,8 @@ int dhd_os_check_wakelock(void *dhdp)
                return 0;
        dhd = (dhd_info_t *)(pub->info);
 
-       if (dhd && wake_lock_active(&dhd->wl_wifi))
+       if (dhd && (wake_lock_active(&dhd->wl_wifi) ||
+           wake_lock_active(&dhd->wl_wdwake)))
                return 1;
 #endif
        return 0;