thermal: rockchip: fix error return code in rockchip_thermal_probe()

PATCH Applied Gustavo A. R. Silva 2 participants 2 messages Aug 8, 2017 – Aug 11, 2017

Subsystems (2)

Arm Rockchip Thermal

lore

Share & tools

lore

Gustavo A. R. Silva

author

2017-08-08 04:35 UTC #0 lore raw

PATCH 1/1 thermal: rockchip: fix error return code in rockchip_thermal_probe()

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

Notice that platform_get_irq() no longer returns 0 on error:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af

Print and propagate the return value of platform_get_irq on failure.

This issue was detected with the help of Coccinelle.

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/thermal/rockchip_thermal.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/thermal/rockchip_thermal.c +2 -2

index 4c77965..6ca9747 100644
@@ -1068,8 +1068,8 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
-		dev_err(&pdev->dev, "no irq resource?\n");
-		return -EINVAL;
+		dev_err(&pdev->dev, "no irq resource: %d\n", irq);
+		return irq;
 	}
 
 	thermal = devm_kzalloc(&pdev->dev, sizeof(struct rockchip_thermal_data),

Signature · 1 line

2.5.0

Zhang Rui

reviewer Applied

2017-08-11 03:08 UTC #1 lore raw

Quoted 10 lines · Gustavo A. R. Silva

platform_get_irq() returns an error code, but the rockchip_thermal driver
ignores it and always returns -EINVAL. This is not correct and, prevents
-EPROBE_DEFER from being propagated properly.
Notice that platform_get_irq() no longer returns 0 on error:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/co
mmit/?id=e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af

Quoted 5 lines

Print and propagate the return value of platform_get_irq on failure.
This issue was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>

Applied.

thanks,
rui

Quoted 22 lines

---
?drivers/thermal/rockchip_thermal.c | 4 ++--
?1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thermal/rockchip_thermal.c +0 -0
index 4c77965..6ca9747 100644
@@ -1068,8 +1068,8 @@ static int rockchip_thermal_probe(struct
 platform_device *pdev)
?
? irq = platform_get_irq(pdev, 0);
? if (irq < 0) {
drivers/thermal/rockchip_thermal.c +2 -2
-		dev_err(&pdev->dev, "no irq resource?\n");
-		return -EINVAL;
+		dev_err(&pdev->dev, "no irq resource: %d\n", irq);
+		return irq;
? }
?
? thermal = devm_kzalloc(&pdev->dev, sizeof(struct
rockchip_thermal_data),