summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2026-08-21 16:40:40 -0500
committerBjorn Helgaas <bhelgaas@google.com>2026-08-21 16:40:40 -0500
commitc4afb0b2d3341ed0bd746705ff8fa174976afae6 (patch)
tree679ef6b9c7bb1d346a2a2147104dd69857a79e99 /include
parent4fe60541de1176c55028aedf755a8968bfab1b97 (diff)
parent008cb88edb41f3c7c8e0ed763ff9f26719830984 (diff)
downloadlinux-c4afb0b2d3341ed0bd746705ff8fa174976afae6.tar.gz
linux-c4afb0b2d3341ed0bd746705ff8fa174976afae6.zip
Merge branch 'pci/controller/host-generic'
- Fix NULL pointer dereference that caused enumeration failures on 32-bit CAM systems (Steffen Persvold) * pci/controller/host-generic: PCI: host-generic: Fix NULL pointer dereference on 32-bit CAM systems
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci-ecam.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h
index d930651473b4..044f67ced6ff 100644
--- a/include/linux/pci-ecam.h
+++ b/include/linux/pci-ecam.h
@@ -81,6 +81,9 @@ void __iomem *pci_ecam_map_bus(struct pci_bus *bus, unsigned int devfn,
/* default ECAM ops */
extern const struct pci_ecam_ops pci_generic_ecam_ops;
+/* default CAM ops */
+extern const struct pci_ecam_ops pci_generic_cam_ops;
+
#if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)
extern const struct pci_ecam_ops pci_32b_ops; /* 32-bit accesses only */
extern const struct pci_ecam_ops pci_32b_read_ops; /* 32-bit read only */