From 5e6fee736ee0d85acd74f955cab0110b15de4d11 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 29 Nov 2025 17:50:53 +0300 Subject: [PATCH] remoteproc: qcom_q6v5_adsp: Fix a NULL vs IS_ERR() check in adsp_alloc_memory_region() The devm_ioremap_resource_wc() function never returns NULL, it returns error pointers. Update the check to match. Fixes: c70b9d5fdcd7 ("remoteproc: qcom: Use of_reserved_mem_region_* functions for "memory-region"") Signed-off-by: Dan Carpenter Link: https://lore.kernel.org/r/6d6b1b0fb6a61b5155a640507217fd7e658858cf.1764427595.git.dan.carpenter@linaro.org Signed-off-by: Bjorn Andersson --- drivers/remoteproc/qcom_q6v5_adsp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c index d3933a66ed3dd..b5c8d6d38c9cb 100644 --- a/drivers/remoteproc/qcom_q6v5_adsp.c +++ b/drivers/remoteproc/qcom_q6v5_adsp.c @@ -637,9 +637,10 @@ static int adsp_alloc_memory_region(struct qcom_adsp *adsp) adsp->mem_phys = adsp->mem_reloc = res.start; adsp->mem_size = resource_size(&res); adsp->mem_region = devm_ioremap_resource_wc(adsp->dev, &res); - if (!adsp->mem_region) { + if (IS_ERR(adsp->mem_region)) { dev_err(adsp->dev, "unable to map memory region: %pR\n", &res); - return -EBUSY; + return PTR_ERR(adsp->mem_region); + } return 0; -- 2.47.3