diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-03 16:27:01 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-03 16:27:01 -0500 |
| commit | b2cd5dd71a59a85d910f52070992decd406f9da7 (patch) | |
| tree | 6eb847a2b953f5b8929f0d4b0623382fa0df3094 /drivers/acpi/pci_root.c | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
| parent | a45de93eb10ae44446aec2c73d722562ab46092a (diff) | |
Merge branch 'acpica' into acpi-resources
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 6 |
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) | |||
| 112 | if (ACPI_FAILURE(status)) | 112 | if (ACPI_FAILURE(status)) |
| 113 | return AE_OK; | 113 | return AE_OK; |
| 114 | 114 | ||
| 115 | if ((address.address_length > 0) && | 115 | if ((address.address.address_length > 0) && |
| 116 | (address.resource_type == ACPI_BUS_NUMBER_RANGE)) { | 116 | (address.resource_type == ACPI_BUS_NUMBER_RANGE)) { |
| 117 | res->start = address.minimum; | 117 | res->start = address.address.minimum; |
| 118 | res->end = address.minimum + address.address_length - 1; | 118 | res->end = address.address.minimum + address.address.address_length - 1; |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | return AE_OK; | 121 | return AE_OK; |