Skip to contentSkip to conversation

counter: ti-ecap-capture: fix IS_ERR() vs NULL check

PATCH In review Dan Carpenter 4 participants 4 messages Oct 12, 2022 – Oct 13, 2022

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

PATCH 1/1 counter: ti-ecap-capture: fix IS_ERR() vs NULL check

The devm_counter_alloc() function returns NULL on error. It doesn't return error pointers.

Fixes 4e2f42aa00b6 ("counter: ti-ecap-capture: capture driver support for ECAP")
---
 drivers/counter/ti-ecap-capture.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/counter/ti-ecap-capture.c +2 -2
index af10de30aba5..8104d02bb5a4 100644
@@ -479,8 +479,8 @@ static int ecap_cnt_probe(struct platform_device *pdev)
 	int ret;
 
 	counter_dev = devm_counter_alloc(dev, sizeof(*ecap_dev));
-	if (IS_ERR(counter_dev))
-		return PTR_ERR(counter_dev);
+	if (!counter_dev)
+		return -ENOMEM;
 
 	counter_dev->name = ECAP_DRV_NAME;
 	counter_dev->parent = dev;
Signature · 1 line
2.35.1
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 24 lines · Dan Carpenter

The devm_counter_alloc() function returns NULL on error. It doesn't return error pointers.

Fixes 4e2f42aa00b6 ("counter: ti-ecap-capture: capture driver support for ECAP")
---
  drivers/counter/ti-ecap-capture.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/counter/ti-ecap-capture.c +2 -2
index af10de30aba5..8104d02bb5a4 100644
@@ -479,8 +479,8 @@ static int ecap_cnt_probe(struct platform_device *pdev)
  	int ret;
 
  	counter_dev = devm_counter_alloc(dev, sizeof(*ecap_dev));
-	if (IS_ERR(counter_dev))
-		return PTR_ERR(counter_dev);
+	if (!counter_dev)
+		return -ENOMEM;
 
  	counter_dev->name = ECAP_DRV_NAME;
  	counter_dev->parent = dev;
maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Dan Carpenter

Hi,

Quoted 5 lines · Dan Carpenter

The devm_counter_alloc() function returns NULL on error. It doesn't return error pointers.

Fixes 4e2f42aa00b6 ("counter: ti-ecap-capture: capture driver support for ECAP")

Thanks for the fix!

Quoted 19 lines
---
 drivers/counter/ti-ecap-capture.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/counter/ti-ecap-capture.c +2 -2
index af10de30aba5..8104d02bb5a4 100644
@@ -479,8 +479,8 @@ static int ecap_cnt_probe(struct platform_device *pdev)
 	int ret;
 
 	counter_dev = devm_counter_alloc(dev, sizeof(*ecap_dev));
-	if (IS_ERR(counter_dev))
-		return PTR_ERR(counter_dev);
+	if (!counter_dev)
+		return -ENOMEM;
 
 	counter_dev->name = ECAP_DRV_NAME;
 	counter_dev->parent = dev;