diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-03 22:27:01 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-03 22:27:01 +0100 |
commit | b2cd5dd71a59a85d910f52070992decd406f9da7 (patch) | |
tree | 6eb847a2b953f5b8929f0d4b0623382fa0df3094 /arch/x86/pci/mmconfig-shared.c | |
parent | Linux 3.19-rc7 (diff) | |
parent | ACPICA: Resources: Provide common part for struct acpi_resource_address struc... (diff) | |
download | linux-b2cd5dd71a59a85d910f52070992decd406f9da7.tar.xz linux-b2cd5dd71a59a85d910f52070992decd406f9da7.zip |
Merge branch 'acpica' into acpi-resources
Diffstat (limited to 'arch/x86/pci/mmconfig-shared.c')
-rw-r--r-- | arch/x86/pci/mmconfig-shared.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 326198a4434e..5a8dceac3094 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c @@ -397,12 +397,12 @@ static acpi_status check_mcfg_resource(struct acpi_resource *res, void *data) status = acpi_resource_to_address64(res, &address); if (ACPI_FAILURE(status) || - (address.address_length <= 0) || + (address.address.address_length <= 0) || (address.resource_type != ACPI_MEMORY_RANGE)) return AE_OK; - if ((mcfg_res->start >= address.minimum) && - (mcfg_res->end < (address.minimum + address.address_length))) { + if ((mcfg_res->start >= address.address.minimum) && + (mcfg_res->end < (address.address.minimum + address.address.address_length))) { mcfg_res->flags = 1; return AE_CTRL_TERMINATE; } |