summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorDavid Shaohua Li <shaohua.li@intel.com>2005-07-14 00:00:00 -0400
committerLen Brown <len.brown@intel.com>2005-07-14 00:40:26 -0400
commit4c3ffbd79529b680b3c3ef2b6f42f0c89c694ec5 (patch)
tree73fda3f9304453b8ed2c435287065369ea6fb3fd /drivers/acpi
parent73459f73e5d1602c59ebec114fc45185521353c1 (diff)
downloadop-kernel-dev-4c3ffbd79529b680b3c3ef2b6f42f0c89c694ec5.zip
op-kernel-dev-4c3ffbd79529b680b3c3ef2b6f42f0c89c694ec5.tar.gz
[ACPI] revert R40 workaround
Should not be necessary... http://bugme.osdl.org/show_bug.cgi?id=1038 Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/utilities/utdelete.c42
1 files changed, 3 insertions, 39 deletions
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index bc54030..be97ada 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -439,7 +439,7 @@ acpi_ut_update_object_reference (
u32 i;
union acpi_generic_state *state_list = NULL;
union acpi_generic_state *state;
- union acpi_operand_object *tmp;
+
ACPI_FUNCTION_TRACE_PTR ("ut_update_object_reference", object);
@@ -472,16 +472,8 @@ acpi_ut_update_object_reference (
switch (ACPI_GET_OBJECT_TYPE (object)) {
case ACPI_TYPE_DEVICE:
- tmp = object->device.system_notify;
- if (tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
- 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);
-
+ acpi_ut_update_ref_count (object->device.system_notify, action);
+ acpi_ut_update_ref_count (object->device.device_notify, action);
break;
@@ -502,10 +494,6 @@ acpi_ut_update_object_reference (
if (ACPI_FAILURE (status)) {
goto error_exit;
}
-
- tmp = object->package.elements[i];
- if (tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
- object->package.elements[i] = NULL;
}
break;
@@ -517,10 +505,6 @@ acpi_ut_update_object_reference (
if (ACPI_FAILURE (status)) {
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;
@@ -531,10 +515,6 @@ acpi_ut_update_object_reference (
if (ACPI_FAILURE (status)) {
goto error_exit;
}
-
- tmp = object->field.region_obj;
- if ( tmp && (tmp->common.reference_count <= 1) && action == REF_DECREMENT)
- object->field.region_obj = NULL;
break;
@@ -546,19 +526,11 @@ acpi_ut_update_object_reference (
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 (
object->bank_field.region_obj, action, &state_list);
if (ACPI_FAILURE (status)) {
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;
@@ -570,19 +542,11 @@ acpi_ut_update_object_reference (
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 (
object->index_field.data_obj, action, &state_list);
if (ACPI_FAILURE (status)) {
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;
OpenPOWER on IntegriCloud