From 8b18c8239463e13d2552a7d84f3094d30e223317 Mon Sep 17 00:00:00 2001 From: Avinash Patil Date: Fri, 22 Mar 2013 21:49:06 -0700 Subject: [PATCH] --- yaml --- r: 369083 b: refs/heads/master c: c24d992ab6b6f067f78585b723fa0c95b3a9c8bf h: refs/heads/master i: 369081: 287849feb3ebcea4e3c56a15a33791da04da4ffe 369079: 7cd52420065de7e53cde78acb7de92587e202d27 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/pcie.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4e9621f55b4d..4284e6bc6932 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2fda1f6662681dc854ac902249a89d210cd5583 +refs/heads/master: c24d992ab6b6f067f78585b723fa0c95b3a9c8bf diff --git a/trunk/drivers/net/wireless/mwifiex/pcie.c b/trunk/drivers/net/wireless/mwifiex/pcie.c index e62cd8a18898..ed1bca7af84a 100644 --- a/trunk/drivers/net/wireless/mwifiex/pcie.c +++ b/trunk/drivers/net/wireless/mwifiex/pcie.c @@ -1983,12 +1983,13 @@ static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter) } } } else if (!adapter->pps_uapsd_mode && - adapter->ps_state == PS_STATE_SLEEP) { + adapter->ps_state == PS_STATE_SLEEP && + mwifiex_pcie_ok_to_access_hw(adapter)) { /* Potentially for PCIe we could get other * interrupts like shared. Don't change power * state until cookie is set */ - if (mwifiex_pcie_ok_to_access_hw(adapter)) - adapter->ps_state = PS_STATE_AWAKE; + adapter->ps_state = PS_STATE_AWAKE; + adapter->pm_wakeup_fw_try = false; } } }