Commit 7c03f0d6 authored by Todd Kjos's avatar Todd Kjos Committed by Greg Kroah-Hartman
Browse files

binder: remove unneeded cleanup code 



The buffer's transaction has already been freed before
binder_deferred_release. No need to do it again.

Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fdfb4a99

drivers/android/binder.c

+2 −9
Original line number Diff line number Diff line
@@ -3631,7 +3631,6 @@ static int binder_node_release(struct binder_node *node, int refs) 


static void binder_deferred_release(struct binder_proc *proc)

{

	struct binder_transaction *t;

	struct binder_context *context = proc->context;

	struct rb_node *n;

	int threads, nodes, incoming_refs, outgoing_refs, buffers,
@@ -3689,14 +3688,8 @@ static void binder_deferred_release(struct binder_proc *proc) 


		buffer = rb_entry(n, struct binder_buffer, rb_node);



		t = buffer->transaction;

		if (t) {

			t->buffer = NULL;

			buffer->transaction = NULL;

			pr_err("release proc %d, transaction %d, not freed\n",

			       proc->pid, t->debug_id);

			/*BUG();*/

		}

		/* Transaction should already have been freed */

		BUG_ON(buffer->transaction);



		binder_free_buf(proc, buffer);

		buffers++;