linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: Jim Quinlan <jim2101024@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	james.quinlan@broadcom.com, linux-pci@vger.kernel.org,
	bcm-kernel-feedback-list@broadcom.com
Subject: Re: [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators
Date: Wed, 12 Jan 2022 13:47:06 -0600	[thread overview]
Message-ID: <20220112194706.GA274996@bhelgaas> (raw)
In-Reply-To: <20220112013100.48029-1-jim2101024@gmail.com>

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
> 

      parent reply	other threads:[~2022-01-12 19:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-12  1:31 [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators Jim Quinlan
2022-01-12 17:51 ` Bjorn Helgaas
2022-01-12 18:00   ` Lorenzo Pieralisi
2022-01-12 18:57     ` Jim Quinlan
2022-01-12 21:50     ` Lukas Wunner
2022-01-12 21:55       ` Bjorn Helgaas
2022-01-12 19:47 ` Bjorn Helgaas [this message]

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=20220112194706.GA274996@bhelgaas \
    --to=helgaas@kernel.org \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=bhelgaas@google.com \
    --cc=james.quinlan@broadcom.com \
    --cc=jim2101024@gmail.com \
    --cc=linux-pci@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).