PCI: faraday: Fix of_irq_get() error check
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Sat, 15 Jul 2017 21:43:10 +0000 (00:43 +0300)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 16 Aug 2017 16:42:28 +0000 (11:42 -0500)
of_irq_get() may return a negative error number as well as 0 on failure,
while the driver only checks for 0, blithely continuing with the call to
irq_set_chained_handler_and_data() -- that function expects *unsigned int*
so should probably do nothing when a large IRQ number resulting from a
conversion of a negative error number is passed to it. The driver then
probes successfully while being only partly functional...

Check for 'irq <= 0' instead and propagate the negative error number to the
probe method --  that will allow the deferred probing as well.

Fixes: d3c68e0a7e34 ("PCI: faraday: Add Faraday Technology FTPCI100 PCI Host Bridge driver")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pci/host/pci-ftpci100.c

index 5162dffc102b02c5241b1be909234f415736e67d..3f5d224e7b1a8d04aac64b452e264bc75e9915c2 100644 (file)
@@ -350,9 +350,9 @@ static int faraday_pci_setup_cascaded_irq(struct faraday_pci *p)
 
        /* All PCI IRQs cascade off this one */
        irq = of_irq_get(intc, 0);
-       if (!irq) {
+       if (irq <= 0) {
                dev_err(p->dev, "failed to get parent IRQ\n");
-               return -EINVAL;
+               return irq ?: -EINVAL;
        }
 
        p->irqdomain = irq_domain_add_linear(intc, 4,