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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 53499C433E0 for ; Thu, 18 Jun 2020 02:13:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25E4C20853 for ; Thu, 18 Jun 2020 02:13:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592446420; bh=UE99R/8O57eB1sCguwm+EjnLTOZkZ01A8/nNZo5jfic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PCAaiEjZ72yrDkql3CSeRjU0eOAxCACNBFHn2tdlStGJUtLBE8BP9p9vxMej2sHwz RYygo6Mkqujs0skMdCXqSENDq5ycfxF6v6KdG3Zui+xVUMgx6sEMk0oBAtYwkKuaa5 gdC5LrvPhDO7NaddVVCSLUPoznFFyLZFmPjMfrB0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387515AbgFRCN1 (ORCPT ); Wed, 17 Jun 2020 22:13:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:53384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730433AbgFRBVA (ORCPT ); Wed, 17 Jun 2020 21:21:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 61F7221974; Thu, 18 Jun 2020 01:20:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443260; bh=UE99R/8O57eB1sCguwm+EjnLTOZkZ01A8/nNZo5jfic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HY7z4BeSWkV6UO0mlPwMcc52MtNobvARuV3wphSuyQzyaTaIoTk4hHSXgj1hqOqlS NgiU6dow0FFeoH/tDAQE6hz8vaaxyFQ+8Qpa+yDTzcpMEdAPRbIuqL/b0gW/kskKK+ f5k9/ffWbeQZD7M2LPkpbgqMjwZyrRNhTnRFqe28= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: huhai , Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.4 207/266] powerpc/4xx: Don't unmap NULL mbase Date: Wed, 17 Jun 2020 21:15:32 -0400 Message-Id: <20200618011631.604574-207-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618011631.604574-1-sashal@kernel.org> References: <20200618011631.604574-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: huhai [ Upstream commit bcec081ecc940fc38730b29c743bbee661164161 ] Signed-off-by: huhai Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20200521072648.1254699-1-mpe@ellerman.id.au Signed-off-by: Sasha Levin --- arch/powerpc/platforms/4xx/pci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/4xx/pci.c b/arch/powerpc/platforms/4xx/pci.c index e6e2adcc7b64..c13d64c3b019 100644 --- a/arch/powerpc/platforms/4xx/pci.c +++ b/arch/powerpc/platforms/4xx/pci.c @@ -1242,7 +1242,7 @@ static void __init ppc460sx_pciex_check_link(struct ppc4xx_pciex_port *port) if (mbase == NULL) { printk(KERN_ERR "%pOF: Can't map internal config space !", port->node); - goto done; + return; } while (attempt && (0 == (in_le32(mbase + PECFG_460SX_DLLSTA) @@ -1252,9 +1252,7 @@ static void __init ppc460sx_pciex_check_link(struct ppc4xx_pciex_port *port) } if (attempt) port->link = 1; -done: iounmap(mbase); - } static struct ppc4xx_pciex_hwops ppc460sx_pcie_hwops __initdata = { -- 2.25.1