Skip to content

Commit

Permalink
Merge tag 'staging-3.14-rc4' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/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
  • Loading branch information
Linus Torvalds committed Feb 23, 2014
2 parents 7834904 + e194fd8 commit b9c2b05
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/staging/android/binder.c
Original file line number Diff line number Diff line change
Expand Up @@ -2904,7 +2904,7 @@ static int binder_node_release(struct binder_node *node, int refs)
refs++;

if (!ref->death)
goto out;
continue;

death++;

Expand All @@ -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);
Expand Down

0 comments on commit b9c2b05

Please sign in to comment.