lkml.org 
[lkml]   [2020]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.6 112/177] gpio: bcm-kona: Fix return value of bcm_kona_gpio_probe()
    Date
    From: Tiezhu Yang <yangtiezhu@loongson.cn>

    [ Upstream commit 98f7d1b15e87c84488b30ecc4ec753b0690b9dbf ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpio/gpio-bcm-kona.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
    index baee8c3f06ad..cf3687a7925f 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;
    }

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-01 20:37    [W:4.036 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site