From patchwork Tue Jun 23 19:57:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223419 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.0 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 58E60C433E1 for ; Tue, 23 Jun 2020 20:39:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2AB8221531 for ; Tue, 23 Jun 2020 20:39:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944783; bh=7HRnQUlSIzXrXc23vfe19xkfrnz/fgB5igccBfMgwb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IipzeiLW7/SkVME+DULLHLIh/A7ldg/PGLfMT+h7CDcD/VXy7r/IkXaLqx651N1nn Ag+0pNhYZAGhJ3RgYTks274EBZRlrj0iVLQNSwDBGk360gnUHcnfptu9/Dpce0bYPV frpAoLQLcARNpnQ1Qh5AV1jFGkk8Oj1WDGgrf/OM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392076AbgFWUjl (ORCPT ); Tue, 23 Jun 2020 16:39:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:35424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390650AbgFWUjk (ORCPT ); Tue, 23 Jun 2020 16:39:40 -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 9CE08215A4; Tue, 23 Jun 2020 20:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944781; bh=7HRnQUlSIzXrXc23vfe19xkfrnz/fgB5igccBfMgwb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iXhuTlawiVYOdLAloMKHoc63+37R1SEX6Gm1dq0/cQmnFnDSmEuIX3eISMUtVWe8/ NFtvMm5wWK8c37wIeQ968wuREBXEWhbme4D+ck2ZNFBwWpvcT8hqqXUXLvWi0MDMZI CiL804sNF5qhDkUZKsb2gVMtXxyD7FvvE04b6HzA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, huhai , Michael Ellerman , Sasha Levin Subject: [PATCH 4.19 122/206] powerpc/4xx: Dont unmap NULL mbase Date: Tue, 23 Jun 2020 21:57:30 +0200 Message-Id: <20200623195322.967122328@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 5aca523551aed..2f237027fdccf 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 = {