Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15480f3a authored by Marc Zyngier's avatar Marc Zyngier Committed by Bjorn Helgaas
Browse files

PCI: layerscape: Fix drvdata usage before assignment 



Commit fefe6733 ("PCI: layerscape: Move struct pcie_port setup
to probe function") changed the init ordering of the pcie structure,
but started to use the pcie->drvdata field before initializing it.
Mayhem follows.

Fix this by moving the drvdata assignment right before the first use.
Tested on LS2085a.

Fixes: efe6733e516 ("PCI: layerscape: Move struct pcie_port setup to probe function")
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent dabe7ecc

drivers/pci/host/pci-layerscape.c

+1 −1
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev) 


	pp = &pcie->pp;

	pp->dev = dev;

	pcie->drvdata = match->data;

	pp->ops = pcie->drvdata->ops;



	dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
@@ -256,7 +257,6 @@ static int __init ls_pcie_probe(struct platform_device *pdev) 
		return PTR_ERR(pcie->pp.dbi_base);

	}



	pcie->drvdata = match->data;

	pcie->lut = pcie->pp.dbi_base + pcie->drvdata->lut_offset;



	if (!ls_pcie_is_bridge(pcie))