Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[sfrench/cifs-2.6.git] / drivers / power / supply / act8945a_charger.c

diff --git a/drivers/power/supply/act8945a_charger.c b/drivers/power/supply/act8945a_charger.c
index d1eb2e359532d0588a189c85a6011149230bfae7..8e117b31ba79116237729a319ed7e57edfa27aad 100644 (file)
--- a/drivers/power/supply/act8945a_charger.c
+++ b/drivers/power/supply/act8945a_charger.c
@@ -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,