summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ath/wil6210/wmi.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2015-12-16 17:28:20 +0300
committerKalle Valo <kvalo@codeaurora.org>2015-12-16 17:28:20 +0300
commitd0ca9900675860d2857f40df88393b199a558634 (patch)
tree9efb02ab89e59a1b184150c85a2a292db8d4ef8e /drivers/net/wireless/ath/wil6210/wmi.c
parent9b2761cb72dc41e1948c8a5512b4efd384eda130 (diff)
parent7c97b72a623cf7f7cfede9caed531b2679556cca (diff)
downloadlinux-d0ca9900675860d2857f40df88393b199a558634.tar.xz
Merge ath-next from ath.git
Major changes: ath9k * add random number generator support (CONFIG_ATH9K_HWRNG)
Diffstat (limited to 'drivers/net/wireless/ath/wil6210/wmi.c')
-rw-r--r--drivers/net/wireless/ath/wil6210/wmi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 6ed26baca0e5..e3ea74cdd4aa 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -228,6 +228,10 @@ static int __wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len)
wil_dbg_wmi(wil, "Head 0x%08x -> 0x%08x\n", r->head, next_head);
/* wait till FW finish with previous command */
for (retry = 5; retry > 0; retry--) {
+ if (!test_bit(wil_status_fwready, wil->status)) {
+ wil_err(wil, "WMI: cannot send command while FW not ready\n");
+ return -EAGAIN;
+ }
r->tail = wil_r(wil, RGF_MBOX +
offsetof(struct wil6210_mbox_ctl, tx.tail));
if (next_head != r->tail)