]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
remoteproc: qcom: pas: Fix a couple NULL vs IS_ERR() bugs
authorDan Carpenter <dan.carpenter@linaro.org>
Sat, 29 Nov 2025 14:51:00 +0000 (17:51 +0300)
committerBjorn Andersson <andersson@kernel.org>
Sat, 29 Nov 2025 20:18:23 +0000 (14:18 -0600)
The devm_ioremap_resource_wc() function never returns NULL, it returns
error pointers.  Update the checking to match.

Fixes: c70b9d5fdcd7 ("remoteproc: qcom: Use of_reserved_mem_region_* functions for "memory-region"")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/0599691acc394d9390da8fa0b5de3399b132b187.1764427595.git.dan.carpenter@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/remoteproc/qcom_q6v5_pas.c

index 609df141ecb1414a6fcc7f60c16b3fed6d6efbd4..52680ac995893bd9b07dae532b879a841f2c2b9a 100644 (file)
@@ -559,9 +559,9 @@ static int qcom_pas_alloc_memory_region(struct qcom_pas *pas)
        pas->mem_phys = pas->mem_reloc = res.start;
        pas->mem_size = resource_size(&res);
        pas->mem_region = devm_ioremap_resource_wc(pas->dev, &res);
-       if (!pas->mem_region) {
+       if (IS_ERR(pas->mem_region)) {
                dev_err(pas->dev, "unable to map memory region: %pR\n", &res);
-               return -EBUSY;
+               return PTR_ERR(pas->mem_region);
        }
 
        if (!pas->dtb_pas_id)
@@ -576,9 +576,9 @@ static int qcom_pas_alloc_memory_region(struct qcom_pas *pas)
        pas->dtb_mem_phys = pas->dtb_mem_reloc = res.start;
        pas->dtb_mem_size = resource_size(&res);
        pas->dtb_mem_region = devm_ioremap_resource_wc(pas->dev, &res);
-       if (!pas->dtb_mem_region) {
+       if (IS_ERR(pas->dtb_mem_region)) {
                dev_err(pas->dev, "unable to map dtb memory region: %pR\n", &res);
-               return -EBUSY;
+               return PTR_ERR(pas->dtb_mem_region);
        }
 
        return 0;