From: Tiezhu Yang <yangtiezhu@loongson.cn>
Date: Fri, 22 May 2020 04:12:18 +0000 (+0800)
Subject: gpio: bcm-kona: Fix return value of bcm_kona_gpio_probe()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=98f7d1b15e87c84488b30ecc4ec753b0690b9dbf;p=linux.git

gpio: bcm-kona: Fix return value of bcm_kona_gpio_probe()

Propagate the error code returned by devm_platform_ioremap_resource()
out of probe() instead of overwriting it.

Fixes: 72d8cb715477 ("drivers: gpio: bcm-kona: use devm_platform_ioremap_resource()")
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
[Bartosz: tweaked the commit message]
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---

diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index baee8c3f06ad8..cf3687a7925ff 100644
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -625,7 +625,7 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)
 
 	kona_gpio->reg_base = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(kona_gpio->reg_base)) {
-		ret = -ENXIO;
+		ret = PTR_ERR(kona_gpio->reg_base);
 		goto err_irq_domain;
 	}