Commit 892dd183 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Boris Brezillon

mtd: nand: atmel: fix of_irq_get() error check

of_irq_get() may return 0 as well as negative error number on failure,
while the driver only checks for the negative values. The driver would
then call devm_request_irq() for IRQ0  in its probe method and never get
a valid interrupt.

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

Fixes: f88fc122 ("mtd: nand: Cleanup/rework the atmel_nand driver")
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: default avatarWenyou Yang <Wenyou.yang@microchip.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent fd213b5b
...@@ -2078,8 +2078,8 @@ atmel_hsmc_nand_controller_legacy_init(struct atmel_hsmc_nand_controller *nc) ...@@ -2078,8 +2078,8 @@ atmel_hsmc_nand_controller_legacy_init(struct atmel_hsmc_nand_controller *nc)
} }
nc->irq = of_irq_get(nand_np, 0); nc->irq = of_irq_get(nand_np, 0);
if (nc->irq < 0) { if (nc->irq <= 0) {
ret = nc->irq; ret = nc->irq ?: -ENXIO;
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get IRQ number (err = %d)\n", dev_err(dev, "Failed to get IRQ number (err = %d)\n",
ret); ret);
...@@ -2168,11 +2168,12 @@ atmel_hsmc_nand_controller_init(struct atmel_hsmc_nand_controller *nc) ...@@ -2168,11 +2168,12 @@ atmel_hsmc_nand_controller_init(struct atmel_hsmc_nand_controller *nc)
nc->irq = of_irq_get(np, 0); nc->irq = of_irq_get(np, 0);
of_node_put(np); of_node_put(np);
if (nc->irq < 0) { if (nc->irq <= 0) {
if (nc->irq != -EPROBE_DEFER) ret = nc->irq ?: -ENXIO;
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get IRQ number (err = %d)\n", dev_err(dev, "Failed to get IRQ number (err = %d)\n",
nc->irq); ret);
return nc->irq; return ret;
} }
np = of_parse_phandle(dev->of_node, "atmel,nfc-io", 0); np = of_parse_phandle(dev->of_node, "atmel,nfc-io", 0);
......
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