summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaya Erez <qca_merez@qca.qualcomm.com>2017-08-21 22:40:55 +0300
committerMaya Erez <merez@codeaurora.org>2017-08-21 22:59:27 +0300
commitc3ab954ff560ce977d1554d1a62896dc21e41354 (patch)
tree493f78b78f3d46df26a74f82dcb322e3fad882c3
parentba2101fc30b4302badba0790f7e6d4222f15a46b (diff)
wil6210: check no_fw_recovery in resume failure recovery
Reset 11ad device on resume failure only if no_fw_recovery is not set. Change-Id: Id90cc9973c2e06f3e9eeae32d3c9065e49f90212 Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> Git-commit: c6622116c5ae56aec47dd3d63be49cabf591162a Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git Signed-off-by: Maya Erez <merez@codeaurora.org>
-rw-r--r--drivers/net/wireless/ath/wil6210/pm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/wil6210/pm.c b/drivers/net/wireless/ath/wil6210/pm.c
index ce1f384e7f8e..45488292a8fc 100644
--- a/drivers/net/wireless/ath/wil6210/pm.c
+++ b/drivers/net/wireless/ath/wil6210/pm.c
@@ -85,7 +85,9 @@ static int wil_resume_keep_radio_on(struct wil6210_priv *wil)
/* Send WMI resume request to the device */
rc = wmi_resume(wil);
if (rc) {
- wil_err(wil, "device failed to resume (%d), resetting\n", rc);
+ wil_err(wil, "device failed to resume (%d)\n", rc);
+ if (no_fw_recovery)
+ goto out;
rc = wil_down(wil);
if (rc) {
wil_err(wil, "wil_down failed (%d)\n", rc);