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

Commit e27fd02d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v4.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:

 - fix NULL pointer dereferences in many DesignWare-based drivers due to
   refactoring error

 - fix Altera config write breakage due to my refactoring error

* tag 'pci-v4.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: altera: Fix TLP_CFG_DW0 for TLP write
  PCI: dwc: Fix crashes seen due to missing assignments
parents f47e2db4 2a7275a3

drivers/pci/dwc/pci-exynos.c

+1 −0
Original line number Diff line number Diff line
@@ -668,6 +668,7 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) 
	pci->dev = dev;

	pci->ops = &dw_pcie_ops;



	ep->pci = pci;

	ep->ops = (const struct exynos_pcie_ops *)

		of_device_get_match_data(dev);

drivers/pci/dwc/pci-imx6.c

+1 −0
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ static int __init imx6_pcie_probe(struct platform_device *pdev) 
	pci->dev = dev;

	pci->ops = &dw_pcie_ops;



	imx6_pcie->pci = pci;

	imx6_pcie->variant =

		(enum imx6_pcie_variants)of_device_get_match_data(dev);

drivers/pci/dwc/pci-keystone.c

+2 −0
Original line number Diff line number Diff line
@@ -401,6 +401,8 @@ static int __init ks_pcie_probe(struct platform_device *pdev) 
	pci->dev = dev;

	pci->ops = &dw_pcie_ops;



	ks_pcie->pci = pci;



	/* initialize SerDes Phy if present */

	phy = devm_phy_get(dev, "pcie-phy");

	if (PTR_ERR_OR_ZERO(phy) == -EPROBE_DEFER)

drivers/pci/dwc/pci-layerscape.c

+2 −0
Original line number Diff line number Diff line
@@ -280,6 +280,8 @@ static int __init ls_pcie_probe(struct platform_device *pdev) 
	pci->dev = dev;

	pci->ops = pcie->drvdata->dw_pcie_ops;



	pcie->pci = pci;



	dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");

	pci->dbi_base = devm_ioremap_resource(dev, dbi_base);

	if (IS_ERR(pci->dbi_base))

drivers/pci/dwc/pcie-armada8k.c

+2 −0
Original line number Diff line number Diff line
@@ -220,6 +220,8 @@ static int armada8k_pcie_probe(struct platform_device *pdev) 
	pci->dev = dev;

	pci->ops = &dw_pcie_ops;



	pcie->pci = pci;



	pcie->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(pcie->clk))

		return PTR_ERR(pcie->clk);