diff options
| -rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index e14c492a8a93..4ce8d1358fee 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
| @@ -2046,13 +2046,13 @@ acpi_sba_ioc_add(struct acpi_device *device) | |||
| 2046 | struct ioc *ioc; | 2046 | struct ioc *ioc; |
| 2047 | acpi_status status; | 2047 | acpi_status status; |
| 2048 | u64 hpa, length; | 2048 | u64 hpa, length; |
| 2049 | struct acpi_device_info *dev_info; | 2049 | struct acpi_device_info *adi; |
| 2050 | 2050 | ||
| 2051 | status = hp_acpi_csr_space(device->handle, &hpa, &length); | 2051 | status = hp_acpi_csr_space(device->handle, &hpa, &length); |
| 2052 | if (ACPI_FAILURE(status)) | 2052 | if (ACPI_FAILURE(status)) |
| 2053 | return 1; | 2053 | return 1; |
| 2054 | 2054 | ||
| 2055 | status = acpi_get_object_info(device->handle, &dev_info); | 2055 | status = acpi_get_object_info(device->handle, &adi); |
| 2056 | if (ACPI_FAILURE(status)) | 2056 | if (ACPI_FAILURE(status)) |
| 2057 | return 1; | 2057 | return 1; |
| 2058 | 2058 | ||
| @@ -2060,13 +2060,13 @@ acpi_sba_ioc_add(struct acpi_device *device) | |||
| 2060 | * For HWP0001, only SBA appears in ACPI namespace. It encloses the PCI | 2060 | * For HWP0001, only SBA appears in ACPI namespace. It encloses the PCI |
| 2061 | * root bridges, and its CSR space includes the IOC function. | 2061 | * root bridges, and its CSR space includes the IOC function. |
| 2062 | */ | 2062 | */ |
| 2063 | if (strncmp("HWP0001", dev_info->hardware_id.string, 7) == 0) { | 2063 | if (strncmp("HWP0001", adi->hardware_id.string, 7) == 0) { |
| 2064 | hpa += ZX1_IOC_OFFSET; | 2064 | hpa += ZX1_IOC_OFFSET; |
| 2065 | /* zx1 based systems default to kernel page size iommu pages */ | 2065 | /* zx1 based systems default to kernel page size iommu pages */ |
| 2066 | if (!iovp_shift) | 2066 | if (!iovp_shift) |
| 2067 | iovp_shift = min(PAGE_SHIFT, 16); | 2067 | iovp_shift = min(PAGE_SHIFT, 16); |
| 2068 | } | 2068 | } |
| 2069 | kfree(dev_info); | 2069 | kfree(adi); |
| 2070 | 2070 | ||
| 2071 | /* | 2071 | /* |
| 2072 | * default anything not caught above or specified on cmdline to 4k | 2072 | * default anything not caught above or specified on cmdline to 4k |
