lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'acpica' into release

Browse Source
This commit is contained in:
Len Brown
2009-09-19 01:45:22 -04:00
parent d093d70a81 c9766237af
commit 985f38781d
68 changed files with 4060 additions and 2203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/container.c
View File

@@ -202,20 +202,17 @@ container_walk_namespace_cb(acpi_handle handle,
u32 lvl, void *context, void **rv)
{
char *hid = NULL;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_device_info *info;
acpi_status status;
int *action = context;
status = acpi_get_object_info(handle, &buffer);
if (ACPI_FAILURE(status) || !buffer.pointer) {
status = acpi_get_object_info(handle, &info);
if (ACPI_FAILURE(status)) {
return AE_OK;
}
info = buffer.pointer;
if (info->valid & ACPI_VALID_HID)
hid = info->hardware_id.value;
hid = info->hardware_id.string;
if (hid == NULL) {
goto end;
@@ -242,7 +239,7 @@ container_walk_namespace_cb(acpi_handle handle,
}
end:
kfree(buffer.pointer);
kfree(info);
return AE_OK;
}