diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2017-07-16 19:52:20 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2017-07-24 14:09:00 +0200 |
| commit | 648b8eba20d0bdce9de41df97677e70aa53693ea (patch) | |
| tree | a70fbf75f4805c462bd85779c98531302d032bcd /drivers/power/supply/act8945a_charger.c | |
| parent | power: supply: cpcap-charger: add OMAP_USB2 dependency (diff) | |
| download | linux-648b8eba20d0bdce9de41df97677e70aa53693ea.tar.xz linux-648b8eba20d0bdce9de41df97677e70aa53693ea.zip | |
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: a09209acd6a8 ("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>
Diffstat (limited to 'drivers/power/supply/act8945a_charger.c')
| -rw-r--r-- | drivers/power/supply/act8945a_charger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/supply/act8945a_charger.c b/drivers/power/supply/act8945a_charger.c index d1eb2e359532..8e117b31ba79 100644 --- 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, |