Commit e5f8d1c7 authored by Bjorn Helgaas's avatar Bjorn Helgaas

Merge branch 'pci/controller/keystone'

- Fix NULL pointer checking when applying MRRS limitation quirk for AM65x
  SR 1.0 Errata #i2037 (Dan Carpenter)

* pci/controller/keystone:
  PCI: keystone: Fix if-statement expression in ks_pcie_quirk()
parents d1624da3 6188a1c7
...@@ -570,7 +570,7 @@ static void ks_pcie_quirk(struct pci_dev *dev) ...@@ -570,7 +570,7 @@ static void ks_pcie_quirk(struct pci_dev *dev)
*/ */
if (pci_match_id(am6_pci_devids, bridge)) { if (pci_match_id(am6_pci_devids, bridge)) {
bridge_dev = pci_get_host_bridge_device(dev); bridge_dev = pci_get_host_bridge_device(dev);
if (!bridge_dev && !bridge_dev->parent) if (!bridge_dev || !bridge_dev->parent)
return; return;
ks_pcie = dev_get_drvdata(bridge_dev->parent); ks_pcie = dev_get_drvdata(bridge_dev->parent);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment