From patchwork Thu Dec 3 16:49:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mian Yousaf Kaukab X-Patchwork-Id: 11949153 X-Patchwork-Delegate: bhelgaas@google.com 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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 F3389C433FE for ; Thu, 3 Dec 2020 16:51:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9723E207AC for ; Thu, 3 Dec 2020 16:51:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729196AbgLCQv0 (ORCPT ); Thu, 3 Dec 2020 11:51:26 -0500 Received: from mx2.suse.de ([195.135.220.15]:53642 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728734AbgLCQv0 (ORCPT ); Thu, 3 Dec 2020 11:51:26 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 295D8AC2E; Thu, 3 Dec 2020 16:50:45 +0000 (UTC) From: Mian Yousaf Kaukab To: lorenzo.pieralisi@arm.com, tjoseph@cadence.com Cc: robh@kernel.org, bhelgaas@google.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, kishon@ti.com, Mian Yousaf Kaukab , stable@vger.kernel.org Subject: [PATCH] PCI: cadence: Fix cdns_pcie_host_setup() error path Date: Thu, 3 Dec 2020 17:49:44 +0100 Message-Id: <20201203164944.2257-1-ykaukab@suse.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org commit 19abcd790b51 ("PCI: cadence: Fix cdns_pcie_{host|ep}_setup() error path") removed pm_runtime_put_sync() call from the error path in cdns_pcie_{host|ep}_setup(). However, the hunk in cdns_pcie_host_setup() got lost. Fix error path in cdns_pcie_host_setup() by removing pm_runtime_put_sync() call. Fixes: 24344226f66b ("PCI: cadence: Use struct pci_host_bridge.windows list directly") Cc: stable@vger.kernel.org Signed-off-by: Mian Yousaf Kaukab --- drivers/pci/controller/cadence/pcie-cadence-host.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c index 811c1cb2e8de..6e2557653943 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-host.c +++ b/drivers/pci/controller/cadence/pcie-cadence-host.c @@ -471,14 +471,5 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) if (!bridge->ops) bridge->ops = &cdns_pcie_host_ops; - ret = pci_host_probe(bridge); - if (ret < 0) - goto err_init; - - return 0; - - err_init: - pm_runtime_put_sync(dev); - - return ret; + return pci_host_probe(bridge); }