diff options
| author | Lin Ming <ming.m.lin@intel.com> | 2009-05-21 04:29:28 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-05-27 06:35:51 +0200 |
| commit | 06366c149232f64c89f513f188ccc6783d0e444f (patch) | |
| tree | 76abc5567488e105091e9ea55f27f62e0dee5363 /drivers/acpi/acpica/exconfig.c | |
| parent | ACPICA: Simplify and optimize NsGetNextNode function (diff) | |
| download | linux-06366c149232f64c89f513f188ccc6783d0e444f.tar.xz linux-06366c149232f64c89f513f188ccc6783d0e444f.zip | |
ACPICA: Fix reference count issues for DdbHandle object
Fix a problem where the DdbHandle could be prematurely deleted,
possibly causing a fault.
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Bob Moore <robert.moore@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 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c index 3deb20a126b2..c0348ff9a602 100644 --- a/drivers/acpi/acpica/exconfig.c +++ b/drivers/acpi/acpica/exconfig.c @@ -229,6 +229,8 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state, walk_state); if (ACPI_FAILURE(status)) { (void)acpi_ex_unload_table(ddb_handle); + + acpi_ut_remove_reference(ddb_handle); return_ACPI_STATUS(status); } } @@ -454,6 +456,10 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, return_ACPI_STATUS(status); } + /* Remove the reference by added by acpi_ex_store above */ + + acpi_ut_remove_reference(ddb_handle); + /* Invoke table handler if present */ if (acpi_gbl_table_handler) { @@ -530,8 +536,5 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle) (void)acpi_tb_release_owner_id(table_index); acpi_tb_set_table_loaded_flag(table_index, FALSE); - /* Table unloaded, remove a reference to the ddb_handle object */ - - acpi_ut_remove_reference(ddb_handle); return_ACPI_STATUS(AE_OK); } |