diff options
Diffstat (limited to 'drivers/acpi/utilities/utobject.c')
| -rw-r--r-- | drivers/acpi/utilities/utobject.c | 13 | 
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c index e25484495e65..916eff399eb3 100644 --- a/drivers/acpi/utilities/utobject.c +++ b/drivers/acpi/utilities/utobject.c  | |||
| @@ -425,6 +425,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object, | |||
| 425 | acpi_size * obj_length) | 425 | acpi_size * obj_length) | 
| 426 | { | 426 | { | 
| 427 | acpi_size length; | 427 | acpi_size length; | 
| 428 | acpi_size size; | ||
| 428 | acpi_status status = AE_OK; | 429 | acpi_status status = AE_OK; | 
| 429 | 430 | ||
| 430 | ACPI_FUNCTION_TRACE_PTR(ut_get_simple_object_size, internal_object); | 431 | ACPI_FUNCTION_TRACE_PTR(ut_get_simple_object_size, internal_object); | 
| @@ -484,10 +485,14 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object, | |||
| 484 | * Get the actual length of the full pathname to this object. | 485 | * Get the actual length of the full pathname to this object. | 
| 485 | * The reference will be converted to the pathname to the object | 486 | * The reference will be converted to the pathname to the object | 
| 486 | */ | 487 | */ | 
| 487 | length += | 488 | size = | 
| 488 | ACPI_ROUND_UP_TO_NATIVE_WORD | 489 | acpi_ns_get_pathname_length(internal_object-> | 
| 489 | (acpi_ns_get_pathname_length | 490 | reference.node); | 
| 490 | (internal_object->reference.node)); | 491 | if (!size) { | 
| 492 | return_ACPI_STATUS(AE_BAD_PARAMETER); | ||
| 493 | } | ||
| 494 | |||
| 495 | length += ACPI_ROUND_UP_TO_NATIVE_WORD(size); | ||
| 491 | break; | 496 | break; | 
| 492 | 497 | ||
| 493 | default: | 498 | default: | 
