diff options
| author | Axel Lin <axel.lin@ingics.com> | 2013-05-19 02:00:47 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-05-20 14:27:30 -0400 |
| commit | cfb10898efe1bc1f3eb8d8f37f164d9e2ac8b43a (patch) | |
| tree | 4633a990efc5bcd9090bb594acc4a9923a0194cc /drivers/gpio | |
| parent | 90dae4ebf03063a70d992aad00d5f5a607c31db8 (diff) | |
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')
| -rw-r--r-- | drivers/gpio/gpio-ml-ioh.c | 3 | ||||
| -rw-r--r-- | drivers/gpio/gpio-pch.c | 3 | ||||
| -rw-r--r-- | drivers/gpio/gpio-sch.c | 6 | ||||
| -rw-r--r-- | drivers/gpio/gpio-viperboard.c | 3 |
4 files changed, 6 insertions, 9 deletions
diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c index b73366523fae..0966f2637ad2 100644 --- a/drivers/gpio/gpio-ml-ioh.c +++ b/drivers/gpio/gpio-ml-ioh.c | |||
| @@ -496,8 +496,7 @@ err_irq_alloc_descs: | |||
| 496 | err_gpiochip_add: | 496 | err_gpiochip_add: |
| 497 | while (--i >= 0) { | 497 | while (--i >= 0) { |
| 498 | chip--; | 498 | chip--; |
| 499 | ret = gpiochip_remove(&chip->gpio); | 499 | if (gpiochip_remove(&chip->gpio)) |
| 500 | if (ret) | ||
| 501 | dev_err(&pdev->dev, "Failed gpiochip_remove(%d)\n", i); | 500 | dev_err(&pdev->dev, "Failed gpiochip_remove(%d)\n", i); |
| 502 | } | 501 | } |
| 503 | kfree(chip_save); | 502 | kfree(chip_save); |
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: | |||
| 424 | err_request_irq: | 424 | err_request_irq: |
| 425 | irq_free_descs(irq_base, gpio_pins[chip->ioh]); | 425 | irq_free_descs(irq_base, gpio_pins[chip->ioh]); |
| 426 | 426 | ||
| 427 | ret = gpiochip_remove(&chip->gpio); | 427 | if (gpiochip_remove(&chip->gpio)) |
| 428 | if (ret) | ||
| 429 | dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__); | 428 | dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__); |
| 430 | 429 | ||
| 431 | err_gpiochip_add: | 430 | err_gpiochip_add: |
diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c index 1e4de16ceb41..5af65719b95d 100644 --- a/drivers/gpio/gpio-sch.c +++ b/drivers/gpio/gpio-sch.c | |||
| @@ -272,10 +272,8 @@ static int sch_gpio_probe(struct platform_device *pdev) | |||
| 272 | return 0; | 272 | return 0; |
| 273 | 273 | ||
| 274 | err_sch_gpio_resume: | 274 | err_sch_gpio_resume: |
| 275 | err = gpiochip_remove(&sch_gpio_core); | 275 | if (gpiochip_remove(&sch_gpio_core)) |
| 276 | if (err) | 276 | dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__); |
| 277 | dev_err(&pdev->dev, "%s failed, %d\n", | ||
| 278 | "gpiochip_remove()", err); | ||
| 279 | 277 | ||
| 280 | err_sch_gpio_core: | 278 | err_sch_gpio_core: |
| 281 | release_region(res->start, resource_size(res)); | 279 | release_region(res->start, resource_size(res)); |
diff --git a/drivers/gpio/gpio-viperboard.c b/drivers/gpio/gpio-viperboard.c index 095ab14cea4d..5ac2919197fe 100644 --- a/drivers/gpio/gpio-viperboard.c +++ b/drivers/gpio/gpio-viperboard.c | |||
| @@ -446,7 +446,8 @@ static int vprbrd_gpio_probe(struct platform_device *pdev) | |||
| 446 | return ret; | 446 | return ret; |
| 447 | 447 | ||
| 448 | err_gpiob: | 448 | err_gpiob: |
| 449 | ret = gpiochip_remove(&vb_gpio->gpioa); | 449 | if (gpiochip_remove(&vb_gpio->gpioa)) |
| 450 | dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__); | ||
| 450 | 451 | ||
| 451 | err_gpioa: | 452 | err_gpioa: |
| 452 | return ret; | 453 | return ret; |