Commit 648b8eba authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Sebastian Reichel

power: supply: act8945a_charger: fix of_irq_get() error check

of_irq_get() may return any negative error number as well as 0 on failure,
while the driver only checks for -EPROBE_DEFER, blithely continuing with
the call to devm_request_irq() -- that function expects *unsigned int*,
so would probably fail anyway when a large IRQ number resulting from a
conversion of a negative error number is passed to it... This, however,
is incorrect behavior -- error number is not IRQ number.

Check for 'irq <= 0' instead and return -ENXIO from probe if of_irq_get()
returned 0.

Fixes: a09209ac ("power: supply: act8945a_charger: Add status change update support")
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
parent 8b35bf59
...@@ -596,9 +596,9 @@ static int act8945a_charger_probe(struct platform_device *pdev) ...@@ -596,9 +596,9 @@ static int act8945a_charger_probe(struct platform_device *pdev)
return ret; return ret;
irq = of_irq_get(pdev->dev.of_node, 0); irq = of_irq_get(pdev->dev.of_node, 0);
if (irq == -EPROBE_DEFER) { if (irq <= 0) {
dev_err(&pdev->dev, "failed to find IRQ number\n"); dev_err(&pdev->dev, "failed to find IRQ number\n");
return -EPROBE_DEFER; return irq ?: -ENXIO;
} }
ret = devm_request_irq(&pdev->dev, irq, act8945a_status_changed, ret = devm_request_irq(&pdev->dev, irq, act8945a_status_changed,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment