diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-05 17:42:08 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-05 17:42:08 +0300 |
| commit | 38220a5e89389b587647128220cd328a5dc92e42 (patch) | |
| tree | 3b112a1fcc3828b2dfa9cb8f8d092b3eee4b6e14 /drivers/acpi/acpi_memhotplug.c | |
| parent | 550b3aac5a72c4209f1ad3bc0ade663d5cb36f7f (diff) | |
| parent | 2eedd3d8398b266ee8e846ded03218bb6a00e2c1 (diff) | |
| download | linux-38220a5e89389b587647128220cd328a5dc92e42.tar.xz | |
Merge branch 'acpica' into acpi-ec
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
| -rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 23e2319ead41..ee28f4d15625 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -101,8 +101,8 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context) /* Can we combine the resource range information? */ if ((info->caching == address64.info.mem.caching) && (info->write_protect == address64.info.mem.write_protect) && - (info->start_addr + info->length == address64.minimum)) { - info->length += address64.address_length; + (info->start_addr + info->length == address64.address.minimum)) { + info->length += address64.address.address_length; return AE_OK; } } @@ -114,8 +114,8 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context) INIT_LIST_HEAD(&new->list); new->caching = address64.info.mem.caching; new->write_protect = address64.info.mem.write_protect; - new->start_addr = address64.minimum; - new->length = address64.address_length; + new->start_addr = address64.address.minimum; + new->length = address64.address.address_length; list_add_tail(&new->list, &mem_device->res_list); return AE_OK; |