OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
30868f5
)
wil6210: check no_fw_recovery in resume failure recovery
author
Maya Erez
<qca_merez@qca.qualcomm.com>
Tue, 8 Aug 2017 11:16:44 +0000
(14:16 +0300)
committer
Kalle Valo
<kvalo@qca.qualcomm.com>
Tue, 8 Aug 2017 18:43:57 +0000
(21:43 +0300)
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>
drivers/net/wireless/ath/wil6210/pm.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/ath/wil6210/pm.c
b/drivers/net/wireless/ath/wil6210/pm.c
index
ce1f384
..
4548829
100644
(file)
--- 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);