1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c
index 7a736f4d1fd8..fe54a8c73b8c 100644
--- a/drivers/acpi/acpica/nsobject.c
+++ b/drivers/acpi/acpica/nsobject.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -222,13 +222,19 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node)
                 }
         }
 
-        /* Clear the entry in all cases */
+        /* Clear the Node entry in all cases */
 
         node->object = NULL;
         if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) == ACPI_DESC_TYPE_OPERAND) {
+
+                /* Unlink object from front of possible object list */
+
                 node->object = obj_desc->common.next_object;
+
+                /* Handle possible 2-descriptor object */
+
                 if (node->object &&
-                    ((node->object)->common.type != ACPI_TYPE_LOCAL_DATA)) {
+                    (node->object->common.type != ACPI_TYPE_LOCAL_DATA)) {
                         node->object = node->object->common.next_object;
                 }
         }