[PATCH] PCI: brcmstb: Add missing if statement
james.quinlan at broadcom.com
Mon Sep 21 16:56:58 EDT 2020
On Mon, Sep 21, 2020 at 4:45 PM Alex Dewar <alex.dewar90 at gmail.com> wrote:
> 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.
> 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 <a.dewar at sussex.ac.uk>
> drivers/pci/controller/pcie-brcmstb.c | 1 +
> 1 file changed, 1 insertion(+)
> diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
> index 7a3ff4632e7c..cb0c11b7308e 100644
> --- a/drivers/pci/controller/pcie-brcmstb.c
> +++ b/drivers/pci/controller/pcie-brcmstb.c
> @@ -1154,6 +1154,7 @@ static int brcm_pcie_resume(struct device *dev)
> ret = brcm_phy_start(pcie);
> + if (ret)
Florian suggested adding braces to the if clause and inserting a
"clk_disable_unprepare(-cie->clk);" before the return. I am fine with
either what you have or implementing Florian's additional suggestion.
> return ret;
> /* Take bridge out of reset so we can access the SERDES reg */
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 4167 bytes
Desc: S/MIME Cryptographic Signature
More information about the linux-arm-kernel