soc: qcom: llcc-qcom: Fix NULL vs IS_ERR() bug in qcom_llcc_get_fw_config()

[PATCH next] soc: qcom: llcc-qcom: Fix NULL vs IS_ERR() bug in qcom_llcc_get_fw_config()

Posted by Dan Carpenter 4 days, 18 hours ago

The devm_memremap() function doesn't return NULL, it returns error
pointers.  Fix the error checking to match.

Fixes: ac23106a9b9a ("soc: qcom: llcc-qcom: get SCT descriptors from fw-populated memory")
Signed-off-by: Dan Carpenter <error27@gmail.com>
---
 drivers/soc/qcom/llcc-qcom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c
index dcc08f63e020..2006bfe198ea 100644
--- a/drivers/soc/qcom/llcc-qcom.c
+++ b/drivers/soc/qcom/llcc-qcom.c
@@ -5231,9 +5231,9 @@ static int qcom_llcc_get_fw_config(struct platform_device *pdev)
 	}
 
 	slc_mem = devm_memremap(dev, res.start, resource_size(&res), MEMREMAP_WB);
-	if (!slc_mem) {
+	if (IS_ERR(slc_mem)) {
 		dev_err(dev, "Failed to memremap SLC shared memory\n");
-		return -ENOMEM;
+		return PTR_ERR(slc_mem);
 	}
 
 	ret = qcom_llcc_verify_fw_config(dev, slc_mem);
-- 
2.53.0

Re: [PATCH next] soc: qcom: llcc-qcom: Fix NULL vs IS_ERR() bug in qcom_llcc_get_fw_config()

Posted by Bjorn Andersson 1 day, 22 hours ago

On Wed, 20 May 2026 09:00:30 +0300, Dan Carpenter wrote:
> The devm_memremap() function doesn't return NULL, it returns error
> pointers.  Fix the error checking to match.
> 
> 

Applied, thanks!

[1/1] soc: qcom: llcc-qcom: Fix NULL vs IS_ERR() bug in qcom_llcc_get_fw_config()
      commit: db0ec1ad723187a3428145b05d4a230d5b6f7e32

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: [PATCH next] soc: qcom: llcc-qcom: Fix NULL vs IS_ERR() bug in qcom_llcc_get_fw_config()

Posted by Mukesh Ojha 4 days, 16 hours ago

On Wed, May 20, 2026 at 09:00:30AM +0300, Dan Carpenter wrote:
> The devm_memremap() function doesn't return NULL, it returns error
> pointers.  Fix the error checking to match.
> 
> Fixes: ac23106a9b9a ("soc: qcom: llcc-qcom: get SCT descriptors from fw-populated memory")
> Signed-off-by: Dan Carpenter <error27@gmail.com>

Duplicate patch

https://lore.kernel.org/lkml/20260519023841.1995542-1-nichen@iscas.ac.cn/

> ---
>  drivers/soc/qcom/llcc-qcom.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c
> index dcc08f63e020..2006bfe198ea 100644
> --- a/drivers/soc/qcom/llcc-qcom.c
> +++ b/drivers/soc/qcom/llcc-qcom.c
> @@ -5231,9 +5231,9 @@ static int qcom_llcc_get_fw_config(struct platform_device *pdev)
>  	}
>  
>  	slc_mem = devm_memremap(dev, res.start, resource_size(&res), MEMREMAP_WB);
> -	if (!slc_mem) {
> +	if (IS_ERR(slc_mem)) {
>  		dev_err(dev, "Failed to memremap SLC shared memory\n");
> -		return -ENOMEM;
> +		return PTR_ERR(slc_mem);
>  	}
>  
>  	ret = qcom_llcc_verify_fw_config(dev, slc_mem);
> -- 
> 2.53.0
> 

-- 
-Mukesh Ojha