diff options
| author |   Axel Lin <axel.lin@ingics.com> | 2013-05-19 14:00:47 +0800 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2013-05-20 20:27:30 +0200 |
| commit | cfb10898efe1bc1f3eb8d8f37f164d9e2ac8b43a (patch) | |
| tree | 4633a990efc5bcd9090bb594acc4a9923a0194cc /drivers/gpio/gpio-pch.c | |
| parent | gpio: mxs: Use set and clear capabilities of the gpio controller (diff) | |
| download | linux-dev-cfb10898efe1bc1f3eb8d8f37f164d9e2ac8b43a.tar.xz linux-dev-cfb10898efe1bc1f3eb8d8f37f164d9e2ac8b43a.zip | |
gpio: Don't override the error code in probe error handling
Otherwise, we return 0 in probe error paths when gpiochip_remove() returns 0.
Also show error message if gpiochip_remove() fails.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Cc: Tomoya MORINAGA <tomoya.rohm@gmail.com>
Cc: Denis Turischev <denis@compulab.co.il>
Cc: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-pch.c')
| -rw-r--r-- | drivers/gpio/gpio-pch.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c index cdf599687cf7..0fec097e838d 100644 --- a/drivers/gpio/gpio-pch.c +++ b/drivers/gpio/gpio-pch.c @@ -424,8 +424,7 @@ end: err_request_irq: irq_free_descs(irq_base, gpio_pins[chip->ioh]); - ret = gpiochip_remove(&chip->gpio); - if (ret) + if (gpiochip_remove(&chip->gpio)) dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__); err_gpiochip_add: |