summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
authorRafael J. Wysocki2015-02-03 22:27:01 +0100
committerRafael J. Wysocki2015-02-03 22:27:01 +0100
commitb2cd5dd71a59a85d910f52070992decd406f9da7 (patch)
tree6eb847a2b953f5b8929f0d4b0623382fa0df3094 /drivers/acpi/pci_root.c
parentLinux 3.19-rc7 (diff)
parentACPICA: Resources: Provide common part for struct acpi_resource_address struc... (diff)
downloadkernel-qcow2-linux-b2cd5dd71a59a85d910f52070992decd406f9da7.tar.gz
kernel-qcow2-linux-b2cd5dd71a59a85d910f52070992decd406f9da7.tar.xz
kernel-qcow2-linux-b2cd5dd71a59a85d910f52070992decd406f9da7.zip
Merge branch 'acpica' into acpi-resources
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r--drivers/acpi/pci_root.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index c6bcb8c719d8..e53e0f659204 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -112,10 +112,10 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
if (ACPI_FAILURE(status))
return AE_OK;
- if ((address.address_length > 0) &&
+ if ((address.address.address_length > 0) &&
(address.resource_type == ACPI_BUS_NUMBER_RANGE)) {
- res->start = address.minimum;
- res->end = address.minimum + address.address_length - 1;
+ res->start = address.address.minimum;
+ res->end = address.address.minimum + address.address.address_length - 1;
}
return AE_OK;