linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / acpi / parser / psutils.c

diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c
index 0d3c56a..3e07cb9 100644 (file)
--- a/drivers/acpi/parser/psutils.c
+++ b/drivers/acpi/parser/psutils.c
@@ -138,16 +138,12 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode)
                /* The generic op (default) is by far the most common (16 to 1) */
 
                op = acpi_os_acquire_object(acpi_gbl_ps_node_cache);
-
-               if (op)
-                       memset(op, 0, sizeof(struct acpi_parse_obj_common));
+               memset(op, 0, sizeof(struct acpi_parse_obj_common));
        } else {
                /* Extended parseop */
 
                op = acpi_os_acquire_object(acpi_gbl_ps_node_ext_cache);
-
-               if (op)
-                       memset(op, 0, sizeof(struct acpi_parse_obj_named));
+               memset(op, 0, sizeof(struct acpi_parse_obj_named));
        }
 
        /* Initialize the Op */