From: Dan Carpenter <dan.carpenter@linaro.org>
Date: Sat, 29 Nov 2025 14:51:00 +0000 (+0300)
Subject: remoteproc: qcom: pas: Fix a couple NULL vs IS_ERR() bugs
X-Git-Tag: v6.19-rc1~82^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7839f773eef2072144fc858b4456aa346fcd665;p=thirdparty%2Fkernel%2Flinux.git

remoteproc: qcom: pas: Fix a couple NULL vs IS_ERR() bugs

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>
---

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 609df141ecb14..52680ac995893 100644
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -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;