diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 14:25:31 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 14:25:31 -0500 |
| commit | e5f8d1c75b29b65e29aed7599130fc709b93c84d (patch) | |
| tree | 86c8d2283a822441e59ab960de484fe5ce4ad659 /drivers/pci/controller | |
| parent | d1624da381cb1d9c877e631ec07ee10cb3664bbb (diff) | |
| parent | 6188a1c762eb9bbd444f47696eda77a5eae6207a (diff) | |
| download | linux-e5f8d1c75b29b65e29aed7599130fc709b93c84d.tar.gz linux-e5f8d1c75b29b65e29aed7599130fc709b93c84d.tar.bz2 linux-e5f8d1c75b29b65e29aed7599130fc709b93c84d.zip | |
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()
Diffstat (limited to 'drivers/pci/controller')
| -rw-r--r-- | drivers/pci/controller/dwc/pci-keystone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index ce9d9e0a5260..2219b1a866fa 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -570,7 +570,7 @@ static void ks_pcie_quirk(struct pci_dev *dev) */ if (pci_match_id(am6_pci_devids, bridge)) { bridge_dev = pci_get_host_bridge_device(dev); - if (!bridge_dev && !bridge_dev->parent) + if (!bridge_dev || !bridge_dev->parent) return; ks_pcie = dev_get_drvdata(bridge_dev->parent); |