soc: qcom: llcc-qcom: Fix NULL vs IS_ERR() bug in qcom_llcc_get_fw_config()
Subsystems (3)
PATCH 1/1 soc: qcom: llcc-qcom: Fix NULL vs IS_ERR() bug in qcom_llcc_get_fw_config()
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 <[email protected]>
--- drivers/soc/qcom/llcc-qcom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/qcom/llcc-qcom.c +2 -2
@@ -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);
Signature · 1 line
2.53.0
Quoted 5 lines · Dan Carpenter
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 <[email protected]>
Duplicate patch
https://lore.kernel.org/lkml/[email protected]/
Quoted 23 lines
--- drivers/soc/qcom/llcc-qcom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/soc/qcom/llcc-qcom.c +2
-2@@ -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);Signature · 1 line
2.53.0
Signature · 1 line
-Mukesh Ojha
Quoted 4 lines · Dan Carpenter
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,
Signature · 1 line
Bjorn Andersson <[email protected]>