diff --git a/[refs] b/[refs] index 6c0ac0b4d5d6..5b42835b6ea0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab347d94d6515ea9a5be04faccd9b14a319b0a7a +refs/heads/master: 497f16f21a04060098c0da6ed522fbcafb90c0db diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index faccb8937706..6d4a5319148d 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -1129,7 +1129,11 @@ static int __pci_enable_device_flags(struct pci_dev *dev, if (atomic_add_return(1, &dev->enable_cnt) > 1) return 0; /* already enabled */ - for (i = 0; i < PCI_ROM_RESOURCE; i++) + /* only skip sriov related */ + for (i = 0; i <= PCI_ROM_RESOURCE; i++) + if (dev->resource[i].flags & flags) + bars |= (1 << i); + for (i = PCI_BRIDGE_RESOURCES; i < DEVICE_COUNT_RESOURCE; i++) if (dev->resource[i].flags & flags) bars |= (1 << i);