Commit 648b8eba authored Jul 16, 2017 by Sergei Shtylyov Committed by Sebastian Reichel Jul 24, 2017

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: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

parent 8b35bf59

drivers/power/supply/act8945a_charger.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -596,9 +596,9 @@ static int act8945a_charger_probe(struct platform_device *pdev)
		return ret;

		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");
		return -EPROBE_DEFER;
		return irq ?: -ENXIO;
		}

		ret = devm_request_irq(&pdev->dev, irq, act8945a_status_changed,