Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d85142b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/resource' into next 

* pci/resource:
  PCI: Add missing MEM_64 mask in pci_assign_unassigned_bridge_resources()
parents 359c660e d61b0e87

drivers/pci/setup-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -1652,7 +1652,7 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge) 
	struct pci_dev_resource *fail_res;

	int retval;

	unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |

				  IORESOURCE_PREFETCH;

				  IORESOURCE_PREFETCH | IORESOURCE_MEM_64;



again:

	__pci_bus_size_bridges(parent, &add_list);