OSDN Git Service

gpio: msic: fix error return code in platform_msic_gpio_probe()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Thu, 3 Aug 2017 22:00:01 +0000 (17:00 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 10 Nov 2018 15:41:39 +0000 (07:41 -0800)
[ Upstream commit ca1f3ae3154ad6d08caa740c99be0d86644a4e44 ]

platform_get_irq() returns an error code, but the gpio-msic driver
ignores it and always returns -EINVAL. This is not correct, and
prevents -EPROBE_DEFER from being propagated properly.

Notice that platform_get_irq() no longer returns 0 on error:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af

Print and propagate the return value of platform_get_irq on failure.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpio/gpio-msic.c

index 22523aa..3abf066 100644 (file)
@@ -266,8 +266,8 @@ static int platform_msic_gpio_probe(struct platform_device *pdev)
        int i;
 
        if (irq < 0) {
-               dev_err(dev, "no IRQ line\n");
-               return -EINVAL;
+               dev_err(dev, "no IRQ line: %d\n", irq);
+               return irq;
        }
 
        if (!pdata || !pdata->gpio_base) {