Skip to contentSkip to conversation

cxl/region: Fix IS_ERR() vs NULL check

PATCH Applied Dan Carpenter 3 participants 3 messages Aug 3, 2022 – Aug 5, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cxl/region: Fix IS_ERR() vs NULL check

The nvdimm_pmem_region_create() function returns NULL on error. It does not return error pointers.

Fixes 04ad63f086d1 ("cxl/region: Introduce cxl_pmem_region objects")
---
 drivers/cxl/pmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/cxl/pmem.c +2 -2
index e69f99a0747d..7dc0a2fa1a6b 100644
@@ -525,8 +525,8 @@ static int cxl_pmem_region_probe(struct device *dev)
 
 	cxlr_pmem->nd_region =
 		nvdimm_pmem_region_create(cxl_nvb->nvdimm_bus, &ndr_desc);
-	if (IS_ERR(cxlr_pmem->nd_region)) {
-		rc = PTR_ERR(cxlr_pmem->nd_region);
+	if (!cxlr_pmem->nd_region) {
+		rc = -ENOMEM;
 		goto err;
 	}
 
Signature · 1 line
2.35.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · On Wed, 3 Aug 2022 12:07:50 +0300 Dan Carpenter <[email protected]>…

The nvdimm_pmem_region_create() function returns NULL on error. It does not return error pointers.

Fixes 04ad63f086d1 ("cxl/region: Introduce cxl_pmem_region objects")

LGTM

Quoted 19 lines
---
 drivers/cxl/pmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/cxl/pmem.c +2 -2
index e69f99a0747d..7dc0a2fa1a6b 100644
@@ -525,8 +525,8 @@ static int cxl_pmem_region_probe(struct device *dev)
 
 	cxlr_pmem->nd_region =
 		nvdimm_pmem_region_create(cxl_nvb->nvdimm_bus, &ndr_desc);
-	if (IS_ERR(cxlr_pmem->nd_region)) {
-		rc = PTR_ERR(cxlr_pmem->nd_region);
+	if (!cxlr_pmem->nd_region) {
+		rc = -ENOMEM;
 		goto err;
 	}
 
Applied
#2 lore raw
In reply to Dan Carpenter
Quoted 14 lines · Dan Carpenter

The nvdimm_pmem_region_create() function returns NULL on error. It does not return error pointers.

Fixes 04ad63f086d1 ("cxl/region: Introduce cxl_pmem_region objects")
---
 drivers/cxl/pmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/cxl/pmem.c +0 -0
index e69f99a0747d..7dc0a2fa1a6b 100644

drivers/cxl/pmem.c static int cxl_pmem_region_probe(struct device *dev) · line 529

Quoted 7 lines
drivers/cxl/pmem.c +2 -2
@@ -525,8 +525,8 @@ static int cxl_pmem_region_probe(struct device *dev)
 
 	cxlr_pmem->nd_region =
 		nvdimm_pmem_region_create(cxl_nvb->nvdimm_bus, &ndr_desc);
-	if (IS_ERR(cxlr_pmem->nd_region)) {
-		rc = PTR_ERR(cxlr_pmem->nd_region);
+	if (!cxlr_pmem->nd_region) {
+		rc = -ENOMEM;

Thanks, applied.