diff options
| author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2017-08-03 18:00:01 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-08-14 09:03:38 -0400 |
| commit | ca1f3ae3154ad6d08caa740c99be0d86644a4e44 (patch) | |
| tree | 21db02b0a20bc14e87180bd63b46b8ef778e96b5 /drivers/gpio/gpio-msic.c | |
| parent | e2c3c1969dc77d4630cc88669f5fc6253210a025 (diff) | |
gpio: msic: fix error return code in platform_msic_gpio_probe()
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>
Diffstat (limited to 'drivers/gpio/gpio-msic.c')
| -rw-r--r-- | drivers/gpio/gpio-msic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-msic.c b/drivers/gpio/gpio-msic.c index 1b7ce7f85886..6cb67595d15f 100644 --- a/drivers/gpio/gpio-msic.c +++ b/drivers/gpio/gpio-msic.c | |||
| @@ -265,8 +265,8 @@ static int platform_msic_gpio_probe(struct platform_device *pdev) | |||
| 265 | int i; | 265 | int i; |
| 266 | 266 | ||
| 267 | if (irq < 0) { | 267 | if (irq < 0) { |
| 268 | dev_err(dev, "no IRQ line\n"); | 268 | dev_err(dev, "no IRQ line: %d\n", irq); |
| 269 | return -EINVAL; | 269 | return irq; |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | if (!pdata || !pdata->gpio_base) { | 272 | if (!pdata || !pdata->gpio_base) { |