gpio: thunderx: fix error return code in thunderx_gpio_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 10 Jan 2018 14:37:13 +0000 (14:37 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Apr 2018 10:32:20 +0000 (12:32 +0200)
[ Upstream commit 76e28f5ffed82b1e81a86c4eb8d0420515765620 ]

Fix to return error code -ENOMEM from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 5a2a30024d8c ("gpio: Add gpio driver support for ThunderX and OCTEON-TX")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: David Daney <david.daney@cavium.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpio/gpio-thunderx.c

index 57efb25..10523ce 100644 (file)
@@ -566,8 +566,10 @@ static int thunderx_gpio_probe(struct pci_dev *pdev,
        txgpio->irqd = irq_domain_create_hierarchy(irq_get_irq_data(txgpio->msix_entries[0].vector)->domain,
                                                   0, 0, of_node_to_fwnode(dev->of_node),
                                                   &thunderx_gpio_irqd_ops, txgpio);
-       if (!txgpio->irqd)
+       if (!txgpio->irqd) {
+               err = -ENOMEM;
                goto out;
+       }
 
        /* Push on irq_data and the domain for each line. */
        for (i = 0; i < ngpio; i++) {