drm/nouveau: make sure display hardware is reinitialised on runtime resume

[firefly-linux-kernel-4.4.55.git] / lib / assoc_array.c

diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index ae146f0734eb59adcd2148af99f5ed89d013bd93..2404d03e251a64ae7634d30c46aa22a08f9b4538 100644 (file)
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -1723,11 +1723,13 @@ ascend_old_tree:
                shortcut = assoc_array_ptr_to_shortcut(ptr);
                slot = shortcut->parent_slot;
                cursor = shortcut->back_pointer;
+               if (!cursor)
+                       goto gc_complete;
        } else {
                slot = node->parent_slot;
                cursor = ptr;
        }
-       BUG_ON(!ptr);
+       BUG_ON(!cursor);
        node = assoc_array_ptr_to_node(cursor);
        slot++;
        goto continue_node;