Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9c2b050 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging tree fix from Greg KH:
 "Here is a single android driver fix for 3.14-rc4 that fixes a reported
  problem in the binder driver"

* tag 'staging-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: binder: Fix death notifications
parents 78349043 e194fd8a

drivers/staging/android/binder.c

+1 −2
Original line number Diff line number Diff line
@@ -2904,7 +2904,7 @@ static int binder_node_release(struct binder_node *node, int refs) 
		refs++;



		if (!ref->death)

			goto out;

			continue;



		death++;
@@ -2917,7 +2917,6 @@ static int binder_node_release(struct binder_node *node, int refs) 
			BUG();

	}



out:

	binder_debug(BINDER_DEBUG_DEAD_BINDER,

		     "node %d now dead, refs %d, death %d\n",

		     node->debug_id, refs, death);