summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@linux.intel.com>2015-10-14 08:29:40 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-16 22:18:52 +0200
commita3669868d99c8647d780895d83e74d9a921eba2b (patch)
treed930dd9d47ab7f99c77aceb283e3dc89686d55ed
parentPCI/ACPI: Add interface acpi_pci_root_create() (diff)
downloadlinux-a3669868d99c8647d780895d83e74d9a921eba2b.tar.xz
linux-a3669868d99c8647d780895d83e74d9a921eba2b.zip
ACPI/PCI: Reset acpi_root_dev->domain to 0 when pci_ignore_seg is set
Reset acpi_root_dev->domain to 0 when pci_ignore_seg is set to keep consistence between ACPI PCI root device and PCI host bridge device. Acked-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--arch/x86/pci/acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index ff9911707160..5bc018559cc4 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -401,7 +401,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
int node;
if (pci_ignore_seg)
- domain = 0;
+ root->segment = domain = 0;
if (domain && !pci_domains_supported) {
printk(KERN_WARNING "pci_bus %04x:%02x: "