From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66D16C433DF for ; Mon, 1 Jun 2020 18:09:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3CCB9206E2 for ; Mon, 1 Jun 2020 18:09:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034953; bh=Pl1HXmRAUPMbGEu7xe/itWFl+FoRVHBaaAfEczm5H2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OvY5XcLFm06TmdD6qtXrrohXVaawFOC8lv2w72FvLb4cRfUWz7ns+XJpyarsryoZw 97+aaxm5LJXBID4HxfkdhnceonG9MwN7DpQkOZS1XdpSf2Ta1pxq7nMlS44x9vgql4 ZTRLQIGbEoMIMlfHlvWm6VDDAojaK6Iiq5iepMv8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729906AbgFASJM (ORCPT ); Mon, 1 Jun 2020 14:09:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:55538 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730847AbgFASJL (ORCPT ); Mon, 1 Jun 2020 14:09:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6DA8C2068D; Mon, 1 Jun 2020 18:09:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034950; bh=Pl1HXmRAUPMbGEu7xe/itWFl+FoRVHBaaAfEczm5H2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x0O973vcB0gXqhnqm8F9lcB5OZdVIZRUR4q1SQa1jQOFsHA6bbxc5UGU/qManobnF QyipDvxp/azRkQgFXHjHXm0jNkIZXhRoMEyAtTgH2QjVffh3LMEzW8yn1G+cgSsO7I b3oRTj1+PmimbPn3NFT50CuT97IkpRTwBwqmJf2A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tiezhu Yang , Bartosz Golaszewski , Sasha Levin Subject: [PATCH 5.4 085/142] gpio: bcm-kona: Fix return value of bcm_kona_gpio_probe() Date: Mon, 1 Jun 2020 19:54:03 +0200 Message-Id: <20200601174046.724051115@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174037.904070960@linuxfoundation.org> References: <20200601174037.904070960@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tiezhu Yang [ 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 [Bartosz: tweaked the commit message] Signed-off-by: Bartosz Golaszewski Signed-off-by: Sasha Levin --- 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 9fa6d3a967d2..100575973e1f 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c @@ -619,7 +619,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