Commit 4c3ffbd7 authored by David Shaohua Li's avatar David Shaohua Li Committed by Len Brown

[ACPI] revert R40 workaround

Should not be necessary...

http://bugme.osdl.org/show_bug.cgi?id=1038Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 73459f73
...@@ -439,7 +439,7 @@ acpi_ut_update_object_reference ( ...@@ -439,7 +439,7 @@ acpi_ut_update_object_reference (
u32 i; u32 i;
union acpi_generic_state *state_list = NULL; union acpi_generic_state *state_list = NULL;
union acpi_generic_state *state; union acpi_generic_state *state;
union acpi_operand_object *tmp;
ACPI_FUNCTION_TRACE_PTR ("ut_update_object_reference", object); ACPI_FUNCTION_TRACE_PTR ("ut_update_object_reference", object);
...@@ -472,16 +472,8 @@ acpi_ut_update_object_reference ( ...@@ -472,16 +472,8 @@ acpi_ut_update_object_reference (
switch (ACPI_GET_OBJECT_TYPE (object)) { switch (ACPI_GET_OBJECT_TYPE (object)) {
case ACPI_TYPE_DEVICE: case ACPI_TYPE_DEVICE:
tmp = object->device.system_notify; acpi_ut_update_ref_count (object->device.system_notify, action);
if (tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT) acpi_ut_update_ref_count (object->device.device_notify, action);
object->device.system_notify = NULL;
acpi_ut_update_ref_count (tmp, action);
tmp = object->device.device_notify;
if (tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
object->device.device_notify = NULL;
acpi_ut_update_ref_count (tmp, action);
break; break;
...@@ -502,10 +494,6 @@ acpi_ut_update_object_reference ( ...@@ -502,10 +494,6 @@ acpi_ut_update_object_reference (
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
goto error_exit; goto error_exit;
} }
tmp = object->package.elements[i];
if (tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
object->package.elements[i] = NULL;
} }
break; break;
...@@ -517,10 +505,6 @@ acpi_ut_update_object_reference ( ...@@ -517,10 +505,6 @@ acpi_ut_update_object_reference (
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
goto error_exit; goto error_exit;
} }
tmp = object->buffer_field.buffer_obj;
if ( tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
object->buffer_field.buffer_obj = NULL;
break; break;
...@@ -531,10 +515,6 @@ acpi_ut_update_object_reference ( ...@@ -531,10 +515,6 @@ acpi_ut_update_object_reference (
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
goto error_exit; goto error_exit;
} }
tmp = object->field.region_obj;
if ( tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
object->field.region_obj = NULL;
break; break;
...@@ -546,19 +526,11 @@ acpi_ut_update_object_reference ( ...@@ -546,19 +526,11 @@ acpi_ut_update_object_reference (
goto error_exit; goto error_exit;
} }
tmp = object->bank_field.bank_obj;
if ( tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
object->bank_field.bank_obj = NULL;
status = acpi_ut_create_update_state_and_push ( status = acpi_ut_create_update_state_and_push (
object->bank_field.region_obj, action, &state_list); object->bank_field.region_obj, action, &state_list);
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
goto error_exit; goto error_exit;
} }
tmp = object->bank_field.region_obj;
if ( tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
object->bank_field.region_obj = NULL;
break; break;
...@@ -570,19 +542,11 @@ acpi_ut_update_object_reference ( ...@@ -570,19 +542,11 @@ acpi_ut_update_object_reference (
goto error_exit; goto error_exit;
} }
tmp = object->index_field.index_obj;
if ( tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
object->index_field.index_obj = NULL;
status = acpi_ut_create_update_state_and_push ( status = acpi_ut_create_update_state_and_push (
object->index_field.data_obj, action, &state_list); object->index_field.data_obj, action, &state_list);
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
goto error_exit; goto error_exit;
} }
tmp = object->index_field.data_obj;
if ( tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
object->index_field.data_obj = NULL;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment