drm/msm/a3xx: fix error handling in a3xx_gpu_init()

PATCH New Dan Carpenter 1 participant 1 message Oct 1, 2021

Subsystems (5)

DRM drivers Arm Qualcomm mailing list Kernel janitors DRM driver for Qualcomm display hardware +1 more subsystems

lore

Share & tools

lore

Dan Carpenter

author

2021-10-01 12:59 UTC #0 lore raw

PATCH 1/1 drm/msm/a3xx: fix error handling in a3xx_gpu_init()

These error paths returned 1 on failure, instead of a negative error code. This would lead to an Oops in the caller. A second problem is that the check for "if (ret != -ENODATA)" did not work because "ret" was set to 1.

Fixes 5785dd7a8ef0 ("drm/msm: Fix duplicate gpu node in icc summary")

Signed-off-by Dan Carpenter <[email protected]>

---
 drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

drivers/gpu/drm/msm/adreno/a3xx_gpu.c +5 -4

index 4534633fe7cd..8fb847c174ff 100644
@@ -571,13 +571,14 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev)
 	}
 
 	icc_path = devm_of_icc_get(&pdev->dev, "gfx-mem");
-	ret = IS_ERR(icc_path);
-	if (ret)
+	if (IS_ERR(icc_path)) {
+		ret = PTR_ERR(icc_path);
 		goto fail;
+	}
 
 	ocmem_icc_path = devm_of_icc_get(&pdev->dev, "ocmem");
-	ret = IS_ERR(ocmem_icc_path);
-	if (ret) {
+	if (IS_ERR(ocmem_icc_path)) {
+		ret = PTR_ERR(ocmem_icc_path);
 		/* allow -ENODATA, ocmem icc is optional */
 		if (ret != -ENODATA)
 			goto fail;

Signature · 1 line

2.20.1