diff options
Diffstat (limited to 'drivers/pci/setup-res.c')
-rw-r--r-- | drivers/pci/setup-res.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index caed1ce6facd..481c4e18693a 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c | |||
@@ -320,9 +320,11 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz | |||
320 | resource_size_t min_align) | 320 | resource_size_t min_align) |
321 | { | 321 | { |
322 | struct resource *res = dev->resource + resno; | 322 | struct resource *res = dev->resource + resno; |
323 | unsigned long flags; | ||
323 | resource_size_t new_size; | 324 | resource_size_t new_size; |
324 | int ret; | 325 | int ret; |
325 | 326 | ||
327 | flags = res->flags; | ||
326 | res->flags |= IORESOURCE_UNSET; | 328 | res->flags |= IORESOURCE_UNSET; |
327 | if (!res->parent) { | 329 | if (!res->parent) { |
328 | dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR\n", | 330 | dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR\n", |
@@ -339,7 +341,12 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz | |||
339 | dev_info(&dev->dev, "BAR %d: reassigned %pR\n", resno, res); | 341 | dev_info(&dev->dev, "BAR %d: reassigned %pR\n", resno, res); |
340 | if (resno < PCI_BRIDGE_RESOURCES) | 342 | if (resno < PCI_BRIDGE_RESOURCES) |
341 | pci_update_resource(dev, resno); | 343 | pci_update_resource(dev, resno); |
344 | } else { | ||
345 | res->flags = flags; | ||
346 | dev_info(&dev->dev, "BAR %d: %pR (failed to expand by %#llx)\n", | ||
347 | resno, res, (unsigned long long) addsize); | ||
342 | } | 348 | } |
349 | |||
343 | return ret; | 350 | return ret; |
344 | } | 351 | } |
345 | 352 | ||