From a3b89e682d37acab8161c6ae9e5ca6d6e82eb999 Mon Sep 17 00:00:00 2001 From: John Keller Date: Thu, 15 Feb 2007 14:08:30 -0600 Subject: [PATCH] --- yaml --- r: 48679 b: refs/heads/master c: ecb5f7521a309cb9c5fc0832b9705cd2a03d7d45 h: refs/heads/master i: 48677: 1fb89cb4ede364991029d46bed4f5f3d7a8b17a7 48675: cd556ac227a0985888356def62f475eec3468c94 48671: 4cc991f9109d73739eed66f9d4c23c7ecbd402e9 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/tables/tbxface.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3c1af0fafc75..17783a3d0da3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c24e912b61b1ab2301c59777134194066b06465c +refs/heads/master: ecb5f7521a309cb9c5fc0832b9705cd2a03d7d45 diff --git a/trunk/drivers/acpi/tables/tbxface.c b/trunk/drivers/acpi/tables/tbxface.c index 81937003fd53..417ef5fa7666 100644 --- a/trunk/drivers/acpi/tables/tbxface.c +++ b/trunk/drivers/acpi/tables/tbxface.c @@ -338,9 +338,9 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) int i; acpi_status status = AE_NOT_EXIST; - ACPI_FUNCTION_TRACE(acpi_unload_table); + ACPI_FUNCTION_TRACE(acpi_unload_table_id); - /* Find table from the requested type list */ + /* Find table in the global table list */ for (i = 0; i < acpi_gbl_root_table_list.count; ++i) { if (id != acpi_gbl_root_table_list.tables[i].owner_id) { continue; @@ -352,8 +352,9 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) * simply a position within the hierarchy */ acpi_tb_delete_namespace_by_owner(i); - acpi_tb_release_owner_id(i); + status = acpi_tb_release_owner_id(i); acpi_tb_set_table_loaded_flag(i, FALSE); + break; } return_ACPI_STATUS(status); }