On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote: > --- > drivers/pci/controller/pcie-brcmstb.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Thanks, to expedite this since we're in the merge window, I cloned Lorenzo's branch and squashed this into pci/host/brcmstb for v5.17. > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 8a3321314b74..4134f01acd87 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) > err_reset: > reset_control_rearm(pcie->rescal); > err_regulator: > - regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); > + if (pcie->sr) > + regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); > err_disable_clk: > clk_disable_unprepare(pcie->clk); > return ret; > -- > 2.17.1 >
