aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
authorMaya Erez <qca_merez@qca.qualcomm.com>2017-08-08 14:16:44 +0300
committerKalle Valo <kvalo@qca.qualcomm.com>2017-08-08 21:43:57 +0300
commitc6622116c5ae56aec47dd3d63be49cabf591162a (patch)
treeaf3af2c8efdbd40b594f5a839fd82bf8661a65e8 /drivers/net/wireless/ath
parentwil6210: support FW RSSI reporting (diff)
downloadlinux-dev-c6622116c5ae56aec47dd3d63be49cabf591162a.tar.xz
linux-dev-c6622116c5ae56aec47dd3d63be49cabf591162a.zip
wil6210: check no_fw_recovery in resume failure recovery
Reset 11ad device on resume failure only if no_fw_recovery is not set. Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-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);