On Wed, Jan 12, 2022 at 11:51:06AM -0600, Bjorn Helgaas wrote: > On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote: > > What's this connected to? Is this a fix for a patch that has already > been merged? If so, which one? If it's a standalone thing, it needs > a commit log and a Signed-off-by. Actually, that would be good in any > case. Maybe a lore link to the relevant patch? I was about to reply. It is a fixup for one of the branches I am queueing for v5.17 (pci/brcmstb), I can either squash that it myself or you can do it, provided that Jim gives us the commit id this is actually fixing (or a lore link to the patch posting so that we can infer the commit to fix). Lorenzo > > --- > > drivers/pci/controller/pcie-brcmstb.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > 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 > >
