Linux-ARM-Kernel Archive on
 help / color / Atom feed
From: Alex Dewar <>
	Rob Herring <>,
	Florian Fainelli <>,,,
	Lorenzo Pieralisi <>,,,
	Bjorn Helgaas <>,
	Jim Quinlan <>,
	Alex Dewar <>,
	Nicolas Saenz Julienne <>
Subject: [PATCH v2] PCI: brcmstb: Add missing if statement and error path
Date: Mon, 21 Sep 2020 22:16:24 +0100
Message-ID: <> (raw)
In-Reply-To: <>

brcm_pcie_resume() contains a return statement that was presumably
intended to have an "if (ret)" in front of it, otherwise the function
returns prematurely. Fix this.

Additionally, redisable the clock on the error path.

I don't know if this code was tested or not, but I assume that this bug
means that this driver will not resume properly.

Fixes: ad3d29c77e1e ("PCI: brcmstb: Add control of rescal reset")
Addresses-Coverity: CID 1497099: Control flow issues (UNREACHABLE)
Signed-off-by: Alex Dewar <>
Hi Jim,

Here's a new version of the patch.

I added the missing clk_disable_unprepare() and assumed that it would
also be required in the case that the call to brcm_pcie_setup() fails.

I didn't follow the suggestion of adding extra braces to the
if-statement as the kernel style is not to add unnecessary braces in
this case:


 drivers/pci/controller/pcie-brcmstb.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index 7a3ff4632e7c..8bae3a4f8e49 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -1154,7 +1154,8 @@ static int brcm_pcie_resume(struct device *dev)
 	ret = brcm_phy_start(pcie);
-		return ret;
+	if (ret)
+		goto err;
 	/* Take bridge out of reset so we can access the SERDES reg */
 	pcie->bridge_sw_init_set(pcie, 0);
@@ -1169,12 +1170,16 @@ static int brcm_pcie_resume(struct device *dev)
 	ret = brcm_pcie_setup(pcie);
 	if (ret)
-		return ret;
+		goto err;
 	if (pcie->msi)
 	return 0;
+	clk_disable_unprepare(pcie->clk);
+	return ret;
 static void __brcm_pcie_remove(struct brcm_pcie *pcie)

linux-arm-kernel mailing list

  reply index

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-21 20:45 [PATCH] PCI: brcmstb: Add missing if statement Alex Dewar
2020-09-21 20:56 ` Jim Quinlan
2020-09-21 21:16   ` Alex Dewar [this message]
2020-09-21 21:21     ` [PATCH v2] PCI: brcmstb: Add missing if statement and error path Florian Fainelli
2020-09-23  8:20     ` Lorenzo Pieralisi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-ARM-Kernel Archive on

Archives are clonable:
	git clone --mirror linux-arm-kernel/git/0.git
	git clone --mirror linux-arm-kernel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ \
	public-inbox-index linux-arm-kernel

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone