diff options
| author | Len Brown | 2006-06-15 21:19:48 +0200 |
|---|---|---|
| committer | Len Brown | 2006-06-15 21:19:48 +0200 |
| commit | b3899c6613160b18f79e4356184de55311302fe4 (patch) | |
| tree | 4aa7945bac59cbe5bb5d863be2d4ded285d3e936 /drivers/char/agp | |
| parent | [PATCH] cfq-iosched: fix crash in do_div() (diff) | |
| parent | ACPI: ACPICA 20060608 (diff) | |
| download | kernel-qcow2-linux-b3899c6613160b18f79e4356184de55311302fe4.tar.gz kernel-qcow2-linux-b3899c6613160b18f79e4356184de55311302fe4.tar.xz kernel-qcow2-linux-b3899c6613160b18f79e4356184de55311302fe4.zip | |
Pull acpica into release branch
Diffstat (limited to 'drivers/char/agp')
| -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) info = buffer.pointer; info->hardware_id.value[sizeof(info->hardware_id)-1] = '\0'; match = (strcmp(info->hardware_id.value, "HWP0001") == 0); - ACPI_MEM_FREE(info); + kfree(info); if (match) { status = hp_acpi_csr_space(handle, &sba_hpa, &length); if (ACPI_SUCCESS(status)) |