Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / drivers / acpi / executer / exconvrt.c

diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index b732e399b1eff86abb6439ef0657ff9a5fda0272..fd954b4ed83d7fc1cfdbaaa4a42c41e9fbc89473 100644 (file)
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -170,6 +170,9 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
                return_ACPI_STATUS(AE_NO_MEMORY);
        }
 
+       ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Converted value: %8.8X%8.8X\n",
+                         ACPI_FORMAT_UINT64(result)));
+
        /* Save the Result */
 
        return_desc->integer.value = result;
@@ -509,9 +512,8 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                 * Create a new string object and string buffer
                 * (-1 because of extra separator included in string_length from above)
                 */
-               return_desc =
-                   acpi_ut_create_string_object((acpi_size)
-                                                (string_length - 1));
+               return_desc = acpi_ut_create_string_object((acpi_size)
+                                                          (string_length - 1));
                if (!return_desc) {
                        return_ACPI_STATUS(AE_NO_MEMORY);
                }