1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index 483365777670..6a3a883cb8a3 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -119,7 +119,8 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_3A_0T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -223,8 +224,8 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
                         goto cleanup;
                 }
 
-                if (length > 0) {
-                        /* Copy the portion requested */
+                if (buffer) {
+                        /* We have a buffer, copy the portion requested */
 
                         ACPI_MEMCPY(buffer, operand[0]->string.pointer + index,
                                     length);
@@ -242,7 +243,8 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_3A_0T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }