diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/acpi/parser | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/parser')
| -rw-r--r-- | drivers/acpi/parser/psutils.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c index 182474ae8ce9..d405387b7414 100644 --- a/drivers/acpi/parser/psutils.c +++ b/drivers/acpi/parser/psutils.c | |||
| @@ -139,12 +139,10 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode) | |||
| 139 | /* The generic op (default) is by far the most common (16 to 1) */ | 139 | /* The generic op (default) is by far the most common (16 to 1) */ |
| 140 | 140 | ||
| 141 | op = acpi_os_acquire_object(acpi_gbl_ps_node_cache); | 141 | op = acpi_os_acquire_object(acpi_gbl_ps_node_cache); |
| 142 | memset(op, 0, sizeof(struct acpi_parse_obj_common)); | ||
| 143 | } else { | 142 | } else { |
| 144 | /* Extended parseop */ | 143 | /* Extended parseop */ |
| 145 | 144 | ||
| 146 | op = acpi_os_acquire_object(acpi_gbl_ps_node_ext_cache); | 145 | op = acpi_os_acquire_object(acpi_gbl_ps_node_ext_cache); |
| 147 | memset(op, 0, sizeof(struct acpi_parse_obj_named)); | ||
| 148 | } | 146 | } |
| 149 | 147 | ||
| 150 | /* Initialize the Op */ | 148 | /* Initialize the Op */ |