From patchwork Mon Aug 17 15:15:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247851 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2879206ilo; Mon, 17 Aug 2020 11:52:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx74O/xHoARLrgyuOW0fN3vqo+NAMpfD/PDYA7dMD5GgOXm15nfCupYOqilUOO4LX/sJ3YW X-Received: by 2002:a05:6402:1d25:: with SMTP id dh5mr15765659edb.266.1597690325433; Mon, 17 Aug 2020 11:52:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597690325; cv=none; d=google.com; s=arc-20160816; b=rMcqMyegCdFZR7vauwd1okVpnKnujsoA/j/hOvsxyPGoaX/6Jy9f/BpXVRhOr3aXZh GOafuMhaauXmW7eA7BYN80o0L8vAFjzg9H93j3jCi3/fmUmtBdW36REkAD8/nugJjvPD a9Of+7cKI6pb+G/x/rttoH9QFduBMDpSdPIM+NRJ8Slq0bWOXhJVaRw4iNzaZFoqYrLq pVyPa+g0uejm2TSRzaTjgElh3yCLwII3ZWfHq6Mi0N43m9mJ7pgi9ibqO2PkU/clP/fc iKwcSFNfwy4Ds/vTx6TQis9/T/TwAG1l8YmLyEDZ5hZHGA120THqiDvFFn22tWSbvwGm pdoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OHulKVqGnUadNRzGWK7HjUicN7GpCQ1nu6AznrYecbo=; b=w0qdjHa9KVzNyjEmFvmAHvk9hY303b+CmBOypFIbpuJRp5QQ3GAQc9GGKyxrV5kqhM B3kW52xmWdYPx486OXLnLzo1gJEqh3HDG9d9J5RvAKOnUoxtqCFCUamsg8Uj3ezbNNSB NPfqduf9EnT9t1wtH/bnaNNlzrhF8riVZitcCoj7xXNILA33pOEgBZxOVbZ5+kWnp8bc VoW8F5jHbVnhoI7lOdK2HjLbZsnY+Ho367EOKAqiB/pCH5TBAD7sjX7//1Res/pCglKt cDoJDwxsXALrwywzFlPYftE5FOwPpoFa41pnPgaNSThoc/hVDb/ukCW+9PnDX5126WBN F6Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="NjWO2/uj"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k3si11047497eds.225.2020.08.17.11.52.05; Mon, 17 Aug 2020 11:52:05 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="NjWO2/uj"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387607AbgHQPwi (ORCPT + 15 others); Mon, 17 Aug 2020 11:52:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:38588 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387853AbgHQPw3 (ORCPT ); Mon, 17 Aug 2020 11:52:29 -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 377FC20729; Mon, 17 Aug 2020 15:52:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679548; bh=kk+CrH7IOe1p7H2iMl5KzGkfjkMVBGSOCBuhbgPNHqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NjWO2/uj83AGbIMkaHpsJsCoUYrHMzH6nVTJSHVaCo779aYeHb29xUHDCWOTWMmFA 92+irDbp4PrgRsW1wWlBbFr+JTHEZT5HRDGdZa0fdNOFdf7BTBKBgNRMET7z53uBcx hlPNo1+hDqmWmpE5NvbbmLnLdj2EYQ4rWSGSN2ps= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kishon Vijay Abraham I , Lorenzo Pieralisi , Rob Herring , Sasha Levin Subject: [PATCH 5.7 250/393] PCI: cadence: Fix cdns_pcie_{host|ep}_setup() error path Date: Mon, 17 Aug 2020 17:15:00 +0200 Message-Id: <20200817143831.747611942@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@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: Kishon Vijay Abraham I [ Upstream commit 19abcd790b51b26d775e1170ba2ac086823cceeb ] commit bd22885aa188 ("PCI: cadence: Refactor driver to use as a core library") while refactoring the Cadence PCIe driver to be used as library, removed pm_runtime_get_sync() from cdns_pcie_ep_setup() and cdns_pcie_host_setup() but missed to remove the corresponding pm_runtime_put_sync() in the error path. Fix it here. Link: https://lore.kernel.org/r/20200722110317.4744-3-kishon@ti.com Fixes: bd22885aa188 ("PCI: cadence: Refactor driver to use as a core library") Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Lorenzo Pieralisi Reviewed-by: Rob Herring Signed-off-by: Sasha Levin --- drivers/pci/controller/cadence/pcie-cadence-ep.c | 9 ++------- drivers/pci/controller/cadence/pcie-cadence-host.c | 6 +----- 2 files changed, 3 insertions(+), 12 deletions(-) -- 2.25.1 diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c index 1c173dad67d1d..1fdae37843eff 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-ep.c +++ b/drivers/pci/controller/cadence/pcie-cadence-ep.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include "pcie-cadence.h" @@ -440,8 +439,7 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) epc = devm_pci_epc_create(dev, &cdns_pcie_epc_ops); if (IS_ERR(epc)) { dev_err(dev, "failed to create epc device\n"); - ret = PTR_ERR(epc); - goto err_init; + return PTR_ERR(epc); } epc_set_drvdata(epc, ep); @@ -453,7 +451,7 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) resource_size(pcie->mem_res)); if (ret < 0) { dev_err(dev, "failed to initialize the memory space\n"); - goto err_init; + return ret; } ep->irq_cpu_addr = pci_epc_mem_alloc_addr(epc, &ep->irq_phys_addr, @@ -472,8 +470,5 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) free_epc_mem: pci_epc_mem_exit(epc); - err_init: - pm_runtime_put_sync(dev); - return ret; } diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c index 9b1c3966414b1..11eb81da0233f 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-host.c +++ b/drivers/pci/controller/cadence/pcie-cadence-host.c @@ -7,7 +7,6 @@ #include #include #include -#include #include "pcie-cadence.h" @@ -256,7 +255,7 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) ret = cdns_pcie_host_init(dev, &resources, rc); if (ret) - goto err_init; + return ret; list_splice_init(&resources, &bridge->windows); bridge->dev.parent = dev; @@ -274,8 +273,5 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) err_host_probe: pci_free_resource_list(&resources); - err_init: - pm_runtime_put_sync(dev); - return ret; }