diff options
| author | Len Brown <lenb@toshiba.site> | 2006-03-31 02:16:19 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-03-31 02:16:19 -0500 |
| commit | 46358614ed5b031797522f1020e989c959a8d8a6 (patch) | |
| tree | 1f342b7a2a2424d3a71750c1d72ed9337a1b59cf | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
Revert "[PATCH] ACPI: fix vendor resource length computation"
fixed in a different way by a subsequent ACPICA patch
This reverts 35b73ceb9a7d10c81bd9e79e8485f7079ef2b40e commit.
| -rw-r--r-- | drivers/acpi/resources/rscalc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c index 4038dbfa63a0..7d6481d9fbec 100644 --- a/drivers/acpi/resources/rscalc.c +++ b/drivers/acpi/resources/rscalc.c | |||
| @@ -391,7 +391,8 @@ acpi_rs_get_list_length(u8 * aml_buffer, | |||
| 391 | * Ensure a 32-bit boundary for the structure | 391 | * Ensure a 32-bit boundary for the structure |
| 392 | */ | 392 | */ |
| 393 | extra_struct_bytes = | 393 | extra_struct_bytes = |
| 394 | ACPI_ROUND_UP_to_32_bITS(resource_length); | 394 | ACPI_ROUND_UP_to_32_bITS(resource_length) - |
| 395 | resource_length; | ||
| 395 | break; | 396 | break; |
| 396 | 397 | ||
| 397 | case ACPI_RESOURCE_NAME_END_TAG: | 398 | case ACPI_RESOURCE_NAME_END_TAG: |
| @@ -407,7 +408,8 @@ acpi_rs_get_list_length(u8 * aml_buffer, | |||
| 407 | * Add vendor data and ensure a 32-bit boundary for the structure | 408 | * Add vendor data and ensure a 32-bit boundary for the structure |
| 408 | */ | 409 | */ |
| 409 | extra_struct_bytes = | 410 | extra_struct_bytes = |
| 410 | ACPI_ROUND_UP_to_32_bITS(resource_length); | 411 | ACPI_ROUND_UP_to_32_bITS(resource_length) - |
| 412 | resource_length; | ||
| 411 | break; | 413 | break; |
| 412 | 414 | ||
| 413 | case ACPI_RESOURCE_NAME_ADDRESS32: | 415 | case ACPI_RESOURCE_NAME_ADDRESS32: |