Commit e5f8d1c7 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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

drivers/pci/controller/dwc/pci-keystone.c

+1 −1
Original line number Diff line number Diff line
@@ -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);