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