diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-03 16:44:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-03 16:44:21 -0800 |
| commit | e27fd02d92817845471a196b3020c5694cbe5ff3 (patch) | |
| tree | 785051a432a6ee7dcaed6a8c793de8d8318d1377 /drivers/pci/dwc/pcie-artpec6.c | |
| parent | Merge branch 'parisc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (diff) | |
| parent | PCI: altera: Fix TLP_CFG_DW0 for TLP write (diff) | |
| download | linux-dev-e27fd02d92817845471a196b3020c5694cbe5ff3.tar.xz linux-dev-e27fd02d92817845471a196b3020c5694cbe5ff3.zip | |
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
Diffstat (limited to 'drivers/pci/dwc/pcie-artpec6.c')
| -rw-r--r-- | drivers/pci/dwc/pcie-artpec6.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/dwc/pcie-artpec6.c b/drivers/pci/dwc/pcie-artpec6.c index 59ecc9e66436..fcd3ef845883 100644 --- a/drivers/pci/dwc/pcie-artpec6.c +++ b/drivers/pci/dwc/pcie-artpec6.c @@ -253,6 +253,8 @@ static int artpec6_pcie_probe(struct platform_device *pdev) pci->dev = dev; + artpec6_pcie->pci = pci; + dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi"); pci->dbi_base = devm_ioremap_resource(dev, dbi_base); if (IS_ERR(pci->dbi_base)) |