On Wed, Oct 05, 2022 at 07:28:52PM +0530, Manivannan Sadhasivam wrote:
> After commit 6a534df3da88 ("PCI: qcom-ep: Disable IRQs during driver
> remove"), the global irq is stored in the "global_irq" member of pcie_ep
> structure. This eliminates the need of local "irq" variable but that
> commit didn't remove the "irq" variable usage completely and it is still
> used for disable_irq() in error path which is wrong since the variable is
> uninitialized.
>
> Fix this by removing the local "irq" variable and using
> "pcie_ep->global_irq" for disable_irq() in error path.
>
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Fixes: 6a534df3da88 ("PCI: qcom-ep: Disable IRQs during driver remove")
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
For today's "next" branch, I dropped 6a534df3da88 and the subsequent
patches. Hopefully Lorenzo can squash this fix into 6a534df3da88.
I could clone the branch and squash it myself, but that's pretty
fiddly and I usually mess it up.
> ---
> drivers/pci/controller/dwc/pcie-qcom-ep.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/controller/dwc/pcie-qcom-ep.c
> index 16bb8f166c3b..00a0728d5ecd 100644
> --- a/drivers/pci/controller/dwc/pcie-qcom-ep.c
> +++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c
> @@ -614,7 +614,7 @@ static irqreturn_t qcom_pcie_ep_perst_irq_thread(int irq, void *data)
> static int qcom_pcie_ep_enable_irq_resources(struct platform_device *pdev,
> struct qcom_pcie_ep *pcie_ep)
> {
> - int irq, ret;
> + int ret;
>
> pcie_ep->global_irq = platform_get_irq_byname(pdev, "global");
> if (pcie_ep->global_irq < 0)
> @@ -637,7 +637,7 @@ static int qcom_pcie_ep_enable_irq_resources(struct platform_device *pdev,
> "perst_irq", pcie_ep);
> if (ret) {
> dev_err(&pdev->dev, "Failed to request PERST IRQ\n");
> - disable_irq(irq);
> + disable_irq(pcie_ep->global_irq);
> return ret;
> }
>
> --
> 2.25.1
>
