diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-02-15 17:01:04 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-02-15 17:01:04 +0300 |
| commit | b065d3f59ff1905922194bd17c79543289317fc7 (patch) | |
| tree | ee45a9d781085f9649fcdfd5ea108b3657cc90fc /drivers/net/wireless/ath/ath10k/testmode.c | |
| parent | 7272416609126e8910b7f0d0e3dba008aa87830c (diff) | |
| parent | c9f1e32600816d695f817477d56490bfc2ba43c6 (diff) | |
| download | linux-b065d3f59ff1905922194bd17c79543289317fc7.tar.xz | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.11. Major changes:
ath10k
* when trying older firmware versions don't confuse user with error messages
ath9k
* fix crash in AP mode (regression)
* fix relayfs crash (regression)
* fix initialisation with AR9340 and AR9550
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/testmode.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/testmode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath10k/testmode.c b/drivers/net/wireless/ath/ath10k/testmode.c index ed85f938e3c0..8bb36c18a749 100644 --- a/drivers/net/wireless/ath/ath10k/testmode.c +++ b/drivers/net/wireless/ath/ath10k/testmode.c @@ -150,7 +150,10 @@ static int ath10k_tm_fetch_utf_firmware_api_1(struct ath10k *ar, ar->hw_params.fw.dir, ATH10K_FW_UTF_FILE); /* load utf firmware image */ - ret = request_firmware(&fw_file->firmware, filename, ar->dev); + ret = request_firmware_direct(&fw_file->firmware, filename, ar->dev); + ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "testmode fw request '%s': %d\n", + filename, ret); + if (ret) { ath10k_warn(ar, "failed to retrieve utf firmware '%s': %d\n", filename, ret); |