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/pci-imx6.c | |
| parent | f47e2db43d6865358f35a7e2c7aa035321a6537a (diff) | |
| parent | 2a7275a3d867b228216886aae35e1f64291180b1 (diff) | |
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/pci-imx6.c')
| -rw-r--r-- | drivers/pci/dwc/pci-imx6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c index 3ab6761db9e8..801e46cd266d 100644 --- a/drivers/pci/dwc/pci-imx6.c +++ b/drivers/pci/dwc/pci-imx6.c @@ -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); |