1 files changed, 3 insertions, 14 deletions

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 371ac12d25b1..cd49a3982b6a 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -136,8 +136,7 @@ acpi_extract_package(union acpi_object *package,
                                 break;
                         case 'B':
                                 size_required +=
-                                    sizeof(u8 *) +
-                                    (element->buffer.length * sizeof(u8));
+                                    sizeof(u8 *) + element->buffer.length;
                                 tail_offset += sizeof(u8 *);
                                 break;
                         default:
@@ -255,7 +254,7 @@ acpi_extract_package(union acpi_object *package,
                                 memcpy(tail, element->buffer.pointer,
                                        element->buffer.length);
                                 head += sizeof(u8 *);
-                                tail += element->buffer.length * sizeof(u8);
+                                tail += element->buffer.length;
                                 break;
                         default:
                                 /* Should never get here */
@@ -347,22 +346,16 @@ acpi_evaluate_reference(acpi_handle handle,
         package = buffer.pointer;
 
         if ((buffer.length == 0) || !package) {
-                printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
-                            (unsigned)buffer.length, package);
                 status = AE_BAD_DATA;
                 acpi_util_eval_error(handle, pathname, status);
                 goto end;
         }
         if (package->type != ACPI_TYPE_PACKAGE) {
-                printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",
-                            package->type);
                 status = AE_BAD_DATA;
                 acpi_util_eval_error(handle, pathname, status);
                 goto end;
         }
         if (!package->package.count) {
-                printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",
-                            package);
                 status = AE_BAD_DATA;
                 acpi_util_eval_error(handle, pathname, status);
                 goto end;
@@ -381,17 +374,13 @@ acpi_evaluate_reference(acpi_handle handle,
 
                 if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {
                         status = AE_BAD_DATA;
-                        printk(KERN_ERR PREFIX
-                                    "Expecting a [Reference] package element, found type %X\n",
-                                    element->type);
                         acpi_util_eval_error(handle, pathname, status);
                         break;
                 }
 
                 if (!element->reference.handle) {
-                        printk(KERN_WARNING PREFIX "Invalid reference in"
-                               " package %s\n", pathname);
                         status = AE_NULL_ENTRY;
+                        acpi_util_eval_error(handle, pathname, status);
                         break;
                 }
                 /* Get the  acpi_handle. */