aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r--drivers/acpi/pci_root.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index de4d57114fe4..96e68e841539 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -194,7 +194,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
194 unsigned long long value = 0; 194 unsigned long long value = 0;
195 acpi_handle handle = NULL; 195 acpi_handle handle = NULL;
196 struct acpi_device *child; 196 struct acpi_device *child;
197 u32 flags; 197 u32 flags, base_flags;
198 198
199 199
200 if (!device) 200 if (!device)
@@ -216,7 +216,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
216 * All supported architectures that use ACPI have support for 216 * All supported architectures that use ACPI have support for
217 * PCI domains, so we indicate this in _OSC support capabilities. 217 * PCI domains, so we indicate this in _OSC support capabilities.
218 */ 218 */
219 flags = OSC_PCI_SEGMENT_GROUPS_SUPPORT; 219 flags = base_flags = OSC_PCI_SEGMENT_GROUPS_SUPPORT;
220 pci_acpi_osc_support(device->handle, flags); 220 pci_acpi_osc_support(device->handle, flags);
221 221
222 /* 222 /*
@@ -344,6 +344,12 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
344 list_for_each_entry(child, &device->children, node) 344 list_for_each_entry(child, &device->children, node)
345 acpi_pci_bridge_scan(child); 345 acpi_pci_bridge_scan(child);
346 346
347 /* Indicate support for various _OSC capabilities. */
348 if (pci_ext_cfg_avail(root->bus->self))
349 flags |= OSC_EXT_PCI_CONFIG_SUPPORT;
350 if (flags != base_flags)
351 pci_acpi_osc_support(device->handle, flags);
352
347 end: 353 end:
348 if (result) { 354 if (result) {
349 if (!list_empty(&root->node)) 355 if (!list_empty(&root->node))