diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2018-12-20 20:25:43 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2018-12-20 20:25:43 +0300 |
| commit | fbbae71d374f24887d78631e50210b7110fffb84 (patch) | |
| tree | a316b289f9e3fc402afd65a30989be022816d701 /drivers/net/wireless/ath/ath10k/qmi.c | |
| parent | 19de2fa86e692e918eade4042989d7725039df89 (diff) | |
| parent | 84758d4d43e9e38f2bf9b5130b5f7db1c44f1e0b (diff) | |
| download | linux-fbbae71d374f24887d78631e50210b7110fffb84.tar.xz | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.21. Major changes:
ath10k
* add amsdu support for QCA6174 monitor mode
* report tx rate using the new ieee80211_tx_rate_update() API
* wcn3990 support is not experimental anymore
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/qmi.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/qmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c index f0429bee35c2..37b3bd629f48 100644 --- a/drivers/net/wireless/ath/ath10k/qmi.c +++ b/drivers/net/wireless/ath/ath10k/qmi.c @@ -931,9 +931,9 @@ static int ath10k_qmi_setup_msa_resources(struct ath10k_qmi *qmi, u32 msa_size) qmi->msa_mem_size = resource_size(&r); qmi->msa_va = devm_memremap(dev, qmi->msa_pa, qmi->msa_mem_size, MEMREMAP_WT); - if (!qmi->msa_va) { + if (IS_ERR(qmi->msa_va)) { dev_err(dev, "failed to map memory region: %pa\n", &r.start); - return -EBUSY; + return PTR_ERR(qmi->msa_va); } } else { qmi->msa_va = dmam_alloc_coherent(dev, msa_size, |