Merge "android: binder: don't break on first dead binder_ref when releasing nodes" (274227c5) · Commits · e / devices / android_kernel_sony_msm8994

drivers/staging/android/binder.c

+10 −14

Original line number	Diff line number	Diff line
		@@ -2922,12 +2922,8 @@ static int binder_node_release(struct binder_node *node, int refs)

		hlist_for_each_entry(ref, &node->refs, node_entry) {
		refs++;

		if (!ref->death)
		goto out;

		if (ref->death) {
		death++;

		if (list_empty(&ref->death->work.entry)) {
		ref->death->work.type = BINDER_WORK_DEAD_BINDER;
		list_add_tail(&ref->death->work.entry,
		@@ -2936,8 +2932,8 @@ static int binder_node_release(struct binder_node *node, int refs)
		} else
		BUG();
		}
		}

		out:
		binder_debug(BINDER_DEBUG_DEAD_BINDER,
		"node %d now dead, refs %d, death %d\n",
		node->debug_id, refs, death);