UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath10k: fix a NULL vs IS_ERR() check 

The devm_memremap() function doesn't return NULLs, it returns error
pointers.

Fixes: ba94c753cc ("ath10k: add QMI message handshake for wcn3990 client")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Dan Carpenter 2018-12-20 09:53:41 +02:00 committed by Kalle Valo
parent 8765967592
commit c28dcbce05
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ath/ath10k/qmi.c
View File

@ -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_mem_size = resource_size(&r);
qmi->msa_va = devm_memremap(dev, qmi->msa_pa, qmi->msa_mem_size, qmi->msa_va = devm_memremap(dev, qmi->msa_pa, qmi->msa_mem_size,
MEMREMAP_WT); MEMREMAP_WT);
if (!qmi->msa_va) { if (IS_ERR(qmi->msa_va)) {
dev_err(dev, "failed to map memory region: %pa\n", &r.start); dev_err(dev, "failed to map memory region: %pa\n", &r.start);
return -EBUSY; return PTR_ERR(qmi->msa_va);
} }
} else { } else {
qmi->msa_va = dmam_alloc_coherent(dev, msa_size, qmi->msa_va = dmam_alloc_coherent(dev, msa_size,