From 45378ee729e8da0e5c8b6bf7c5c3a9fc04720399 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Fri, 2 Nov 2012 09:38:42 -0700 Subject: [PATCH] net: wireless: bcmdhd: Avoid suspend on watchdog Change-Id: Ic41a8f369a2ee8b2a0084e6a1cbf6b454ff53353 Signed-off-by: Dmitry Shmidt --- drivers/net/wireless/bcmdhd/dhd_linux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c index d0b4c1c325c6..eb155614cd8c 100644 --- 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; -- 2.34.1