diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
| commit | cece901481bafbf14de8cbd3a89ae869ea881055 (patch) | |
| tree | f9e240443643008c8feeaf55919105dc63ab8c72 /drivers/acpi/utils.c | |
| parent | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (diff) | |
| parent | 50dd096973f1d95aa03c6a6d9e148d706b62b68e (diff) | |
Pull style into test branch
Conflicts:
drivers/acpi/button.c
drivers/acpi/ec.c
drivers/acpi/osl.c
drivers/acpi/sbs.c
Diffstat (limited to 'drivers/acpi/utils.c')
| -rw-r--r-- | drivers/acpi/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index d0d84c43a9d4..91fed70a65a6 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c | |||
| @@ -83,7 +83,7 @@ acpi_extract_package(union acpi_object *package, | |||
| 83 | return AE_BAD_DATA; | 83 | return AE_BAD_DATA; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | format_string = (char *)format->pointer; | 86 | format_string = format->pointer; |
| 87 | 87 | ||
| 88 | /* | 88 | /* |
| 89 | * Calculate size_required. | 89 | * Calculate size_required. |
| @@ -361,7 +361,7 @@ acpi_evaluate_reference(acpi_handle handle, | |||
| 361 | if (ACPI_FAILURE(status)) | 361 | if (ACPI_FAILURE(status)) |
| 362 | goto end; | 362 | goto end; |
| 363 | 363 | ||
| 364 | package = (union acpi_object *)buffer.pointer; | 364 | package = buffer.pointer; |
| 365 | 365 | ||
| 366 | if ((buffer.length == 0) || !package) { | 366 | if ((buffer.length == 0) || !package) { |
| 367 | printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n", | 367 | printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n", |