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

Merge branch 'pci/resource' 

  - Allow resizing BARs of devices on root bus (Ard Biesheuvel)

* pci/resource:
  PCI: Allow pci_resize_resource() for devices on root bus
parents ae7322a0 d09ddd81

drivers/pci/setup-res.c

+5 −4
Original line number Diff line number Diff line
@@ -439,10 +439,11 @@ int pci_resize_resource(struct pci_dev *dev, int resno, int size) 
	res->end = res->start + pci_rebar_size_to_bytes(size) - 1;



	/* Check if the new config works by trying to assign everything. */

	if (dev->bus->self) {

		ret = pci_reassign_bridge_resources(dev->bus->self, res->flags);

		if (ret)

			goto error_resize;



	}

	return 0;



error_resize: