diff options
author | Daiane Angolini <daiane.angolini@foundries.io> | 2025-01-03 10:59:26 -0300 |
---|---|---|
committer | Daiane Angolini <daiane.angolini@foundries.io> | 2025-01-03 10:59:26 -0300 |
commit | c930b7842cfd5ccbb315735a35aa2011be20e5f7 (patch) | |
tree | b0738739d89671e4794526fc2a3def9f0dcdbadb /drivers/pci/controller/dwc/pci-keystone.c | |
parent | e1778dcaa00e0c13013abe353f88ae40047d8ff3 (diff) | |
parent | 63a57420cf797edcfca41005dd6c805b77cfb596 (diff) |
Merge tag 'v6.6.54' into 6.6-2.2.x-imx
This is the 6.6.54 stable release
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'drivers/pci/controller/dwc/pci-keystone.c')
-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 c1dedc83759c..c5475830c835 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -579,7 +579,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); |