diff options
Diffstat (limited to 'drivers/acpi/executer/exconvrt.c')
-rw-r--r-- | drivers/acpi/executer/exconvrt.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c index 04e5194989a6..fa9e75d4ec65 100644 --- a/drivers/acpi/executer/exconvrt.c +++ b/drivers/acpi/executer/exconvrt.c | |||
@@ -504,18 +504,12 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc, | |||
504 | } | 504 | } |
505 | 505 | ||
506 | /* | 506 | /* |
507 | * Perform the conversion. | 507 | * Create a new string object and string buffer |
508 | * (-1 because of extra separator included in string_length from above) | 508 | * (-1 because of extra separator included in string_length from above) |
509 | */ | 509 | */ |
510 | string_length--; | ||
511 | if (string_length > ACPI_MAX_STRING_CONVERSION) { /* ACPI limit */ | ||
512 | return_ACPI_STATUS(AE_AML_STRING_LIMIT); | ||
513 | } | ||
514 | |||
515 | /* Create a new string object and string buffer */ | ||
516 | |||
517 | return_desc = | 510 | return_desc = |
518 | acpi_ut_create_string_object((acpi_size) string_length); | 511 | acpi_ut_create_string_object((acpi_size) |
512 | (string_length - 1)); | ||
519 | if (!return_desc) { | 513 | if (!return_desc) { |
520 | return_ACPI_STATUS(AE_NO_MEMORY); | 514 | return_ACPI_STATUS(AE_NO_MEMORY); |
521 | } | 515 | } |