diff options
| author | Bob Moore <robert.moore@intel.com> | 2010-01-21 09:08:31 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-01-22 12:30:02 -0500 |
| commit | 2147d3f00f85c9e993786863d8138694672da01b (patch) | |
| tree | 446fe7d97ded336fbc5c8d8cad9ad87b959a6588 /drivers/acpi/acpica/exconfig.c | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
| download | talos-op-linux-2147d3f00f85c9e993786863d8138694672da01b.tar.gz talos-op-linux-2147d3f00f85c9e993786863d8138694672da01b.zip | |
ACPICA: Update for new gcc-4 warning options
Added several new options for the gcc-4 generation, and updated
the source accordingly. This includes some code restructuring to
eliminate unreachable code, elimination of some gotos, elimination
of unused return values, and some additional casting.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/exconfig.c')
| -rw-r--r-- | drivers/acpi/acpica/exconfig.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c index 46adfa541cbc..2ea8daccba1c 100644 --- a/drivers/acpi/acpica/exconfig.c +++ b/drivers/acpi/acpica/exconfig.c @@ -490,7 +490,11 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, status = acpi_tb_add_table(&table_desc, &table_index); if (ACPI_FAILURE(status)) { - goto cleanup; + + /* Delete allocated table buffer */ + + acpi_tb_delete_table(&table_desc); + return_ACPI_STATUS(status); } /* @@ -533,13 +537,6 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, acpi_gbl_table_handler_context); } - cleanup: - if (ACPI_FAILURE(status)) { - - /* Delete allocated table buffer */ - - acpi_tb_delete_table(&table_desc); - } return_ACPI_STATUS(status); } |
