mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 09:36:22 +02:00
Merge branch 'pci/controller/host-common'
- Request bus reassignment when not probe-only to fix an enumeration regression on Marvell CN106XX and possibly other DT-based systems (Ratheesh Kannoth) * pci/controller/host-common: PCI: host-common: Request bus reassignment when not probe-only
This commit is contained in:
commit
34de291028
|
|
@ -68,6 +68,10 @@ int pci_host_common_init(struct platform_device *pdev,
|
|||
if (IS_ERR(cfg))
|
||||
return PTR_ERR(cfg);
|
||||
|
||||
/* Do not reassign bus numbers if probe only */
|
||||
if (!pci_has_flag(PCI_PROBE_ONLY))
|
||||
pci_add_flags(PCI_REASSIGN_ALL_BUS);
|
||||
|
||||
bridge->sysdata = cfg;
|
||||
bridge->ops = (struct pci_ops *)&ops->pci_ops;
|
||||
bridge->enable_device = ops->enable_device;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user