提交 b9c2b050 编写于 作者: L Linus Torvalds

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
...@@ -2904,7 +2904,7 @@ static int binder_node_release(struct binder_node *node, int refs) ...@@ -2904,7 +2904,7 @@ static int binder_node_release(struct binder_node *node, int refs)
refs++; refs++;
if (!ref->death) if (!ref->death)
goto out; continue;
death++; death++;
...@@ -2917,7 +2917,6 @@ static int binder_node_release(struct binder_node *node, int refs) ...@@ -2917,7 +2917,6 @@ static int binder_node_release(struct binder_node *node, int refs)
BUG(); BUG();
} }
out:
binder_debug(BINDER_DEBUG_DEAD_BINDER, binder_debug(BINDER_DEBUG_DEAD_BINDER,
"node %d now dead, refs %d, death %d\n", "node %d now dead, refs %d, death %d\n",
node->debug_id, refs, death); node->debug_id, refs, death);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册