Skip to contentSkip to conversation

platform/x86: intel_mid_powerbtn: fix error return code in mid_pb_probe()

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Aug 9, 2017 – Aug 13, 2017 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: intel_mid_powerbtn: fix error return code in mid_pb_probe()

platform_get_irq() returns an error code, but the intel_mid_powerbtn driver ignores it and always returns -EINVAL. This is not correct and, prevents -EPROBE_DEFER from being propagated properly.

Print error message and propagate the return value of platform_get_irq on failure.

This issue was detected with the help of Coccinelle.

---
 drivers/platform/x86/intel_mid_powerbtn.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/x86/intel_mid_powerbtn.c +4 -2
index 871cfa6..854a16d 100644
@@ -142,8 +142,10 @@ static int mid_pb_probe(struct platform_device *pdev)
 	if (!id)
 		return -ENODEV;
 
-	if (irq < 0)
-		return -EINVAL;
+	if (irq < 0) {
+		dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);
+		return irq;
+	}
 
 	input = devm_input_allocate_device(&pdev->dev);
 	if (!input)
Signature · 1 line
2.5.0
#1 lore raw
Quoted 8 lines · Gustavo A. R. Silva

platform_get_irq() returns an error code, but the intel_mid_powerbtn driver ignores it and always returns -EINVAL. This is not correct and, prevents -EPROBE_DEFER from being propagated properly.

Print error message and propagate the return value of platform_get_irq on failure.

This issue was detected with the help of Coccinelle.

Pushed to testing, thanks!

Quoted 26 lines
---
 drivers/platform/x86/intel_mid_powerbtn.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/x86/intel_mid_powerbtn.c +4 -3
index 871cfa6..854a16d 100644
@@ -142,8 +142,10 @@ static int mid_pb_probe(struct platform_device *pdev)
        if (!id)
                return -ENODEV;
 
-       if (irq < 0)
-               return -EINVAL;
+       if (irq < 0) {
+               dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);
+               return irq;
+       }
 
        input = devm_input_allocate_device(&pdev->dev);
        if (!input)
--

2.5.0

Signature · 2 lines
With Best Regards,
Andy Shevchenko