diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 15:19:48 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:19:48 -0400 |
| commit | b3899c6613160b18f79e4356184de55311302fe4 (patch) | |
| tree | 4aa7945bac59cbe5bb5d863be2d4ded285d3e936 /drivers/char | |
| parent | 553698f944ed715dfe023b4cef07601f0ce735f0 (diff) | |
| parent | 4c90ece249992c7a2e3fc921e5cdb8eb92193067 (diff) | |
Pull acpica into release branch
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/hp-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index 8c4c6ef748ec..907fb66ec4a9 100644 --- a/drivers/char/agp/hp-agp.c +++ b/drivers/char/agp/hp-agp.c | |||
| @@ -497,7 +497,7 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret) | |||
| 497 | info = buffer.pointer; | 497 | info = buffer.pointer; |
| 498 | info->hardware_id.value[sizeof(info->hardware_id)-1] = '\0'; | 498 | info->hardware_id.value[sizeof(info->hardware_id)-1] = '\0'; |
| 499 | match = (strcmp(info->hardware_id.value, "HWP0001") == 0); | 499 | match = (strcmp(info->hardware_id.value, "HWP0001") == 0); |
| 500 | ACPI_MEM_FREE(info); | 500 | kfree(info); |
| 501 | if (match) { | 501 | if (match) { |
| 502 | status = hp_acpi_csr_space(handle, &sba_hpa, &length); | 502 | status = hp_acpi_csr_space(handle, &sba_hpa, &length); |
| 503 | if (ACPI_SUCCESS(status)) | 503 | if (ACPI_SUCCESS(status)) |