aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/hp-agp.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/agp/hp-agp.c')
-rw-r--r--drivers/char/agp/hp-agp.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index 8f3d4c184914..7bead4c816ca 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -478,7 +478,6 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
478{ 478{
479 acpi_handle handle, parent; 479 acpi_handle handle, parent;
480 acpi_status status; 480 acpi_status status;
481 struct acpi_buffer buffer;
482 struct acpi_device_info *info; 481 struct acpi_device_info *info;
483 u64 lba_hpa, sba_hpa, length; 482 u64 lba_hpa, sba_hpa, length;
484 int match; 483 int match;
@@ -490,13 +489,11 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
490 /* Look for an enclosing IOC scope and find its CSR space */ 489 /* Look for an enclosing IOC scope and find its CSR space */
491 handle = obj; 490 handle = obj;
492 do { 491 do {
493 buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER; 492 status = acpi_get_object_info(handle, &info);
494 status = acpi_get_object_info(handle, &buffer);
495 if (ACPI_SUCCESS(status)) { 493 if (ACPI_SUCCESS(status)) {
496 /* TBD check _CID also */ 494 /* TBD check _CID also */
497 info = buffer.pointer; 495 info->hardware_id.string[sizeof(info->hardware_id.length)-1] = '\0';
498 info->hardware_id.value[sizeof(info->hardware_id)-1] = '\0'; 496 match = (strcmp(info->hardware_id.string, "HWP0001") == 0);
499 match = (strcmp(info->hardware_id.value, "HWP0001") == 0);
500 kfree(info); 497 kfree(info);
501 if (match) { 498 if (match) {
502 status = hp_acpi_csr_space(handle, &sba_hpa, &length); 499 status = hp_acpi_csr_space(handle, &sba_hpa, &length);