Skip to contentSkip to conversation

- acpi_unload_table_id() always returns error

PATCH In review John Keller 2 participants 3 messages Feb 15, 2007 – Feb 16, 2007 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 - acpi_unload_table_id() always returns error

acpi_unload_table_id() is always returning an error status. Also, once the matching table is found, don't bother looking for another match.

---

Index: release/drivers/acpi/tables/tbxface.c
=================================--- release.orig/drivers/acpi/tables/tbxface.c 2007-02-13 08:20:42.000000000 -0600
+++ release/drivers/acpi/tables/tbxface.c 2007-02-15 14:04:07.855248010 -0600
@@ -338,9 +338,9 @@ acpi_status acpi_unload_table_id(acpi_ow
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_ow
* 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);
}

reviewer
#1 lore raw

Thanks for the fix, John.
Do you grant Intel permission to apply it to the upstream ACPICA tree (with its non-GPL license)?

-Len

Quoted 40 lines · John Keller

acpi_unload_table_id() is always returning an error status. Also, once the matching table is found, don't bother looking for another match.

---

Index: release/drivers/acpi/tables/tbxface.c
=================================> --- release.orig/drivers/acpi/tables/tbxface.c 2007-02-13 08:20:42.000000000 -0600
+++ release/drivers/acpi/tables/tbxface.c 2007-02-15 14:04:07.855248010 -0600

(quoted diff) +4 -4
@@ -338,9 +338,9 @@ acpi_status acpi_unload_table_id(acpi_ow
 	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_ow
 		* 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);
 }
-

To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw

Yes.

I understand and agree this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely. I thereby license this patch to be redistributed under any license (GPL or non-GPL) consistent with the project.

John

Quoted 49 lines

Thanks for the fix, John.
Do you grant Intel permission to apply it to the upstream ACPICA tree (with its non-GPL license)?

-Len

Quoted 41 lines · John Keller

acpi_unload_table_id() is always returning an error status. Also, once the matching table is found, don't bother looking for another match.

---

Index: release/drivers/acpi/tables/tbxface.c
===================================================================

drivers/acpi/tables/tbxface.c +4 -4
@@ -338,9 +338,9 @@ acpi_status acpi_unload_table_id(acpi_ow
 	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_ow
 		* 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);
 }
-

To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html