diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 01:45:22 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 01:45:22 -0400 |
| commit | 985f38781d19101aba121df423f92c87b208c6df (patch) | |
| tree | 21b10413b6e24c0eaf5c3b2432e936749a672644 /arch/ia64/hp | |
| parent | d093d70a81b08673d1577ad73419998f02be9d29 (diff) | |
| parent | c9766237afa92e8d7f27bbcd4964f1b43fa0bce8 (diff) | |
| download | blackbird-op-linux-985f38781d19101aba121df423f92c87b208c6df.tar.gz blackbird-op-linux-985f38781d19101aba121df423f92c87b208c6df.zip | |
Merge branch 'acpica' into release
Diffstat (limited to 'arch/ia64/hp')
| -rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 8cfb001092ab..674a8374c6d9 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -2026,24 +2026,21 @@ acpi_sba_ioc_add(struct acpi_device *device) struct ioc *ioc; acpi_status status; u64 hpa, length; - struct acpi_buffer buffer; struct acpi_device_info *dev_info; status = hp_acpi_csr_space(device->handle, &hpa, &length); if (ACPI_FAILURE(status)) return 1; - buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER; - status = acpi_get_object_info(device->handle, &buffer); + status = acpi_get_object_info(device->handle, &dev_info); if (ACPI_FAILURE(status)) return 1; - dev_info = buffer.pointer; /* * For HWP0001, only SBA appears in ACPI namespace. It encloses the PCI * root bridges, and its CSR space includes the IOC function. */ - if (strncmp("HWP0001", dev_info->hardware_id.value, 7) == 0) { + if (strncmp("HWP0001", dev_info->hardware_id.string, 7) == 0) { hpa += ZX1_IOC_OFFSET; /* zx1 based systems default to kernel page size iommu pages */ if (!iovp_shift) |
